diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 20:45:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 20:45:52 +0100 |
| commit | c9afeda55ef29534d7b565bd613122227e046d5b (patch) | |
| tree | 7b7af6b0b078da686d9e65982f54aeda26fc728d /libavcodec/mjpeg.h | |
| parent | 3a5cbc91a45a8524dcf8c68c6ab54412f95f87a2 (diff) | |
| parent | 362383b743f3a379675ff4b310d357893a6a872e (diff) | |
| download | ffmpeg-c9afeda55ef29534d7b565bd613122227e046d5b.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Fix remuxing of IMA_QT in mov.
Do not detect "00000000..." (and other non-changing values) as adp.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpeg.h')
0 files changed, 0 insertions, 0 deletions