diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-12 14:11:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-12 14:11:03 +0200 |
| commit | 9767d7513cbc24f01221965c95e65a73bea780d2 (patch) | |
| tree | f8081bbab248d94222227b1e990c25aae7f3a22e /libavcodec/indeo3.c | |
| parent | d2b9da2f3797de28fda72a96bf8f06608121c6ee (diff) | |
| parent | 46fd6e4f2ebbcd5a00847cdb05fe416466d06d37 (diff) | |
| download | ffmpeg-9767d7513cbc24f01221965c95e65a73bea780d2.tar.gz | |
Merge commit '46fd6e4f2ebbcd5a00847cdb05fe416466d06d37' into release/1.1
* commit '46fd6e4f2ebbcd5a00847cdb05fe416466d06d37':
aac: check the maximum number of channels
update Changelog
riff: check for eof if chunk size and code are 0
oggdec: fix faulty cleanup prototype
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/indeo3.c')
0 files changed, 0 insertions, 0 deletions