diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-22 01:48:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-22 01:49:37 +0100 |
| commit | abf357a9fb2f19467bad8e3e629f8b016091eedf (patch) | |
| tree | 2a42fe6428aeed2b41a4fd5776f2d3c5d25658ea | |
| parent | 1186e7cf95dd097f89ff2fc390bf23f678f6cc54 (diff) | |
| parent | dcf969e98d3f596006a0ddaf077870408b9c09c3 (diff) | |
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>
0 files changed, 0 insertions, 0 deletions