ffmpeg | branch: master | Michael Niedermayer <michae...@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@8)
Conflicts:
Changelog
libavcodec/dnxhddata.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=56252a5e097946be03ba67664d5efc20703a17a1
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
