diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 01:39:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 01:39:49 +0200 |
| commit | 1e83191d5c830a836bcd03d520272ef711503ac9 (patch) | |
| tree | 4db2409137933ec7525126005044832fa1d0550f | |
| parent | 69db5f2779f84c8070e505cf2a26a3d46728a6db (diff) | |
| parent | c4033cd4eb921a9cc8deb513efc6d6a6ba3b2163 (diff) | |
| download | ffmpeg-1e83191d5c830a836bcd03d520272ef711503ac9.tar.gz | |
Merge commit 'c4033cd4eb921a9cc8deb513efc6d6a6ba3b2163' into release/0.10
* commit 'c4033cd4eb921a9cc8deb513efc6d6a6ba3b2163':
h264: reject mismatching luma/chroma bit depths during sps parsing
Conflicts:
libavcodec/h264.c
libavcodec/h264_ps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264.c | 5 | ||||
| -rw-r--r-- | libavcodec/h264_ps.c | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 1bd3628763..3174401cfd 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -4108,11 +4108,6 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){ if(avctx->has_b_frames < 2) 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; - } break; case NAL_PPS: init_get_bits(&s->gb, ptr, bit_length); diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index c703b2836e..d8229e3c55 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -370,6 +370,11 @@ int ff_h264_decode_seq_parameter_set(H264Context *h){ sps->bit_depth_luma, sps->bit_depth_chroma); goto fail; } + if (sps->bit_depth_chroma != sps->bit_depth_luma) { + av_log_missing_feature(s->avctx, + "Different bit depth between chroma and luma", 1); + goto fail; + } sps->transform_bypass = get_bits1(&s->gb); decode_scaling_matrices(h, sps, NULL, 1, sps->scaling_matrix4, sps->scaling_matrix8); }else{ |