diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 16:28:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 16:28:55 +0100 |
| commit | a60abb1ee01ee065fc1ab2a784fefbd5d3c94917 (patch) | |
| tree | 794a40a9593f67c0e098ca1af0ff81c7791e0552 /libavcodec/h264dsp.c | |
| parent | 98dcbb47fa5f51b8ebdf312bcee18b4b9900e7b2 (diff) | |
| parent | bfd26b7ce6efea594f2b99441d900419df3af638 (diff) | |
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@gmx.at>
Diffstat (limited to 'libavcodec/h264dsp.c')
0 files changed, 0 insertions, 0 deletions