ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Thu Jan 29
20:54:25 2015 +0100| [64e7cf12532ecca43535db7a10303b99538a41dc] | committer:
Michael Niedermayer
Merge commit '598f7d046cbf306706623210c5baafa3b7cd1df3'
* commit '598f7d046cbf306706623210c5baafa3b7cd1df3':
DNxHD: Simplify pixel format detection
Conflicts:
libavcodec/dnxhddec.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=64e7cf12532ecca43535db7a10303b99538a41dc
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
