diff options
| author | Michael Niedermayer <[email protected]> | 2014-04-21 15:15:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-04-21 15:15:41 +0200 |
| commit | 9081b4ddddeea2c01036115a2037fb75f279be2a (patch) | |
| tree | f0b50ebb43e3309493bbce6a646dfebaf7bc2f8c | |
| parent | 58e2d529b3df2fda710d8ed684a7d2aafad9b5d0 (diff) | |
| parent | 7f604a048e9b6128cdf9ce7e95f21d1a9822ba39 (diff) | |
Merge commit '7f604a048e9b6128cdf9ce7e95f21d1a9822ba39' into release/1.1
* commit '7f604a048e9b6128cdf9ce7e95f21d1a9822ba39':
h264: reject mismatching luma/chroma bit depths during sps parsing
Conflicts:
libavcodec/h264_ps.c
See: bdeb61ccc67911cfc5e20c7cfb1312d0501ca90a
Merged-by: Michael Niedermayer <[email protected]>
| -rw-r--r-- | libavcodec/h264.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 74b10eeb3e..fd8a878ee2 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2450,12 +2450,6 @@ static int h264_set_parameter_from_sps(H264Context *h) if (s->avctx->has_b_frames < 2) s->avctx->has_b_frames = !s->low_delay; - if (h->sps.bit_depth_luma != h->sps.bit_depth_chroma) { - av_log_missing_feature(s->avctx, - "Different bit depth between chroma and luma", 1); - return AVERROR_PATCHWELCOME; - } - if (s->avctx->bits_per_raw_sample != h->sps.bit_depth_luma || h->cur_chroma_format_idc != h->sps.chroma_format_idc) { if (s->avctx->codec && |