[FFmpeg-cvslog] Merge commit '1a07df31128da3a0020b66502399989b91770d44'

Michael Niedermayer git at videolan.org
Thu Jan 29 21:34:44 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 29 21:11:27 2015 +0100| [56252a5e097946be03ba67664d5efc20703a17a1] | committer: Michael Niedermayer

Merge commit '1a07df31128da3a0020b66502399989b91770d44'

* commit '1a07df31128da3a0020b66502399989b91770d44':
  DNxHD: Add support for id 1258 (DNx100 960x720 at 8)

Conflicts:
	Changelog
	libavcodec/dnxhddata.c

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

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





More information about the ffmpeg-cvslog mailing list