diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-25 03:45:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-25 04:14:38 +0100 |
| commit | 354db19ff44c3e33ba1a4298d1b3eaefb0ddc7e3 (patch) | |
| tree | e5616a78c58f943f66e25a6d5796d2ab807bf3d9 /libavcodec/h264_slice.c | |
| parent | e003a53452856594dcf721caab8af234adb121ca (diff) | |
| download | ffmpeg-354db19ff44c3e33ba1a4298d1b3eaefb0ddc7e3.tar.gz | |
avcodec/h264: Remove bits_per_raw_sample hacks
Fixes assertion failure
Fixes: f12c79769501ee471a5c731b8304ffcb/signal_sigabrt_7ffff6ac8cc9_3766_cov_4267830138_undemuxable_h264.ts
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 44000c7288..1e28c604a9 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -458,11 +458,6 @@ int ff_h264_update_thread_context(AVCodecContext *dst, h->sps.chroma_format_idc != h1->sps.chroma_format_idc || h->sps.colorspace != h1->sps.colorspace)) { - /* set bits_per_raw_sample to the previous value. the check for changed - * bit depth in h264_set_parameter_from_sps() uses it and sets it to - * the current value */ - h->avctx->bits_per_raw_sample = h->sps.bit_depth_luma; - h->width = h1->width; h->height = h1->height; h->mb_height = h1->mb_height; @@ -1303,7 +1298,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) if (h->mb_width != h->sps.mb_width || h->mb_height != h->sps.mb_height * (2 - h->sps.frame_mbs_only_flag) || - h->avctx->bits_per_raw_sample != h->sps.bit_depth_luma || + h->cur_bit_depth_luma != h->sps.bit_depth_luma || h->cur_chroma_format_idc != h->sps.chroma_format_idc ) needs_reinit = 1; @@ -1325,7 +1320,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) must_reinit = (h->context_initialized && ( 16*h->sps.mb_width != h->avctx->coded_width || 16*h->sps.mb_height * (2 - h->sps.frame_mbs_only_flag) != h->avctx->coded_height - || h->avctx->bits_per_raw_sample != h->sps.bit_depth_luma + || h->cur_bit_depth_luma != h->sps.bit_depth_luma || h->cur_chroma_format_idc != h->sps.chroma_format_idc || h->mb_width != h->sps.mb_width || h->mb_height != h->sps.mb_height * (2 - h->sps.frame_mbs_only_flag) |