[FFmpeg-cvslog] Merge commit 'e9a6ae775dabef3942632e8d4ef95fff94a1b310'

Michael Niedermayer git at videolan.org
Thu Nov 13 13:41:15 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 13 13:32:08 2014 +0100| [b882079b1265066e5cc7c4415322919bea4c4651] | committer: Michael Niedermayer

Merge commit 'e9a6ae775dabef3942632e8d4ef95fff94a1b310'

* commit 'e9a6ae775dabef3942632e8d4ef95fff94a1b310':
  dpxenc: mention missing break

Conflicts:
	libavcodec/dpxenc.c

No change as the changed code is implemented differently in FFmpeg

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b882079b1265066e5cc7c4415322919bea4c4651
---





More information about the ffmpeg-cvslog mailing list