diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-05 22:07:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-05 22:10:12 +0100 |
| commit | bcc43de51f37013621934991086a5d6dcb94f493 (patch) | |
| tree | fc40573aa37339a88f39949ae302e879073280bb /libavformat/audiointerleave.c | |
| parent | 81f116d31cca87fa7e041e19eb944f489befd7bc (diff) | |
| parent | b56afb48aecb96e03347f5b569f16a64147c18b1 (diff) | |
| download | ffmpeg-bcc43de51f37013621934991086a5d6dcb94f493.tar.gz | |
Merge commit 'b56afb48aecb96e03347f5b569f16a64147c18b1'
* commit 'b56afb48aecb96e03347f5b569f16a64147c18b1':
mpeg12dec: Print error/warning messages on issues in mpeg1_decode_sequence()
Conflicts:
libavcodec/mpeg12dec.c
See: 88b4c1a7316cf47f68bf04accf613375b7326992
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/audiointerleave.c')
0 files changed, 0 insertions, 0 deletions