[FFmpeg-cvslog] Merge commit '67fc8a15e4182ea111cfcd05897709f09d99a33a'

Michael Niedermayer git at videolan.org
Fri Dec 19 03:56:20 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 19 03:42:16 2014 +0100| [6fcdcc414b6541cb6548f462710d344fb844bafc] | committer: Michael Niedermayer

Merge commit '67fc8a15e4182ea111cfcd05897709f09d99a33a'

* commit '67fc8a15e4182ea111cfcd05897709f09d99a33a':
  theora: support different visible and coded frame size

Conflicts:
	libavcodec/vp3.c

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

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





More information about the ffmpeg-cvslog mailing list