Commit abf357a9 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'dcf969e9'

* commit 'dcf969e9':
  rtpdec_mpeg4: add more verbose error logging

Conflicts:
	libavformat/rtpdec_mpeg4.c

See: fee2cc39Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 1186e7cf dcf969e9
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment