diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-11 17:59:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-11 17:59:58 +0200 |
| commit | 2aa659233810cb17e4748a52298d018fa9cb8d4a (patch) | |
| tree | da11daaff98df52c5b4e703e7a429ed23d1e59d5 /libavutil/parseutils.c | |
| parent | 2b14d980863d7a4044d20978ba5b3bda1c96f607 (diff) | |
| parent | 7f954ca502a16feeca44d4e9a7d450b404dabc94 (diff) | |
| download | ffmpeg-2aa659233810cb17e4748a52298d018fa9cb8d4a.tar.gz | |
Merge commit '7f954ca502a16feeca44d4e9a7d450b404dabc94' into release/2.2
* commit '7f954ca502a16feeca44d4e9a7d450b404dabc94':
avi: Improve non-interleaved detection
Conflicts:
Changelog
libavformat/avidec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/parseutils.c')
0 files changed, 0 insertions, 0 deletions