[FFmpeg-cvslog] Merge commit '598f7d046cbf306706623210c5baafa3b7cd1df3'
Michael Niedermayer
git at videolan.org
Thu Jan 29 21:00:45 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at 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 <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=64e7cf12532ecca43535db7a10303b99538a41dc
---
More information about the ffmpeg-cvslog
mailing list