Merge commit 'dcf969e98d3f596006a0ddaf077870408b9c09c3'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Feb 2015 00:48:53 +0000 (01:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Feb 2015 00:49:37 +0000 (01:49 +0100)
commitabf357a9fb2f19467bad8e3e629f8b016091eedf
tree2a42fe6428aeed2b41a4fd5776f2d3c5d25658ea
parent1186e7cf95dd097f89ff2fc390bf23f678f6cc54
parentdcf969e98d3f596006a0ddaf077870408b9c09c3
Merge commit 'dcf969e98d3f596006a0ddaf077870408b9c09c3'

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

Conflicts:
libavformat/rtpdec_mpeg4.c

See: fee2cc39becb1930461dff267389717337804a4a
Merged-by: Michael Niedermayer <michaelni@gmx.at>