[FFmpeg-cvslog] Merge commit '756547ce7f4d67a18663503e2157aebed3531703'
Michael Niedermayer
git at videolan.org
Thu Oct 10 11:29:11 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct 10 10:54:17 2013 +0200| [dd0429e1de54a6f583384cde010967cad7c10688] | committer: Michael Niedermayer
Merge commit '756547ce7f4d67a18663503e2157aebed3531703'
* commit '756547ce7f4d67a18663503e2157aebed3531703':
avi: DV in AVI must be considered single stream
Conflicts:
libavformat/avidec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dd0429e1de54a6f583384cde010967cad7c10688
---
More information about the ffmpeg-cvslog
mailing list