[FFmpeg-cvslog] Merge commit 'bfd26b7ce6efea594f2b99441d900419df3af638'
Michael Niedermayer
git at videolan.org
Mon Jan 6 16:37:40 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 6 16:28:55 2014 +0100| [a60abb1ee01ee065fc1ab2a784fefbd5d3c94917] | committer: Michael Niedermayer
Merge commit 'bfd26b7ce6efea594f2b99441d900419df3af638'
* commit 'bfd26b7ce6efea594f2b99441d900419df3af638':
h264: reject mismatching luma/chroma bit depths during sps parsing
Conflicts:
libavcodec/h264_ps.c
See: bdeb61ccc67911cfc5e20c7cfb1312d0501ca90a
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a60abb1ee01ee065fc1ab2a784fefbd5d3c94917
---
More information about the ffmpeg-cvslog
mailing list