diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 02:34:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 02:34:10 +0200 |
| commit | 0be41c65862c8ffc9b5b92d4b014f1fc23d8d52e (patch) | |
| tree | 0e4e23550b6ec06ac4a3f333bff12d1122d660a8 /mt-work | |
| parent | 18b233428a9899d3c725d1168a94898c508b35b5 (diff) | |
| parent | 5463a2b0566b34b9e3847db9ceb1ef1d2a6004fc (diff) | |
| download | ffmpeg-0be41c65862c8ffc9b5b92d4b014f1fc23d8d52e.tar.gz | |
Merge commit '5463a2b0566b34b9e3847db9ceb1ef1d2a6004fc' into release/0.10
* commit '5463a2b0566b34b9e3847db9ceb1ef1d2a6004fc':
movdec: handle 0x7fff langcode as macintosh per the specs
avi: Improve non-interleaved detection
Conflicts:
libavformat/avidec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'mt-work')
0 files changed, 0 insertions, 0 deletions