[FFmpeg-cvslog] Merge commit '9d599e3f6e61438772d8cddd6c9b7c495251f51e'
Michael Niedermayer
git at videolan.org
Wed Apr 2 18:08:05 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 2 18:01:48 2014 +0200| [91a0d3af651732d80b5c01777ea1c7ec541ec554] | committer: Michael Niedermayer
Merge commit '9d599e3f6e61438772d8cddd6c9b7c495251f51e'
* commit '9d599e3f6e61438772d8cddd6c9b7c495251f51e':
avi: Improve non-interleaved detection
Conflicts:
libavformat/avidec.c
See: 8df774be88c347c40f1b2411ed9e391dfec0ebb7 and others
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=91a0d3af651732d80b5c01777ea1c7ec541ec554
---
More information about the ffmpeg-cvslog
mailing list