From ecc31f6b086453ab9811dce2ae5ceb6a7c19e4ad Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Wed, 23 Mar 2016 09:41:05 +0100 Subject: h264: move ff_h264_check_intra[4x4]_pred_mode() to h264_parse It is shared with svq3. --- libavcodec/h264_cabac.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'libavcodec/h264_cabac.c') diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index 37f98ddd8a..589a021e1f 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -2076,16 +2076,20 @@ decode_intra_mb: } } write_back_intra_pred_mode(h, sl); - if (ff_h264_check_intra4x4_pred_mode(h, sl) < 0 ) return -1; + if (ff_h264_check_intra4x4_pred_mode(sl->intra4x4_pred_mode_cache, h->avctx, + sl->top_samples_available, sl->left_samples_available) < 0 ) + return -1; } else { - sl->intra16x16_pred_mode = ff_h264_check_intra_pred_mode(h, sl, sl->intra16x16_pred_mode, 0); + sl->intra16x16_pred_mode = ff_h264_check_intra_pred_mode(h->avctx, sl->top_samples_available, + sl->left_samples_available, sl->intra16x16_pred_mode, 0); if (sl->intra16x16_pred_mode < 0) return -1; } if(decode_chroma){ h->chroma_pred_mode_table[mb_xy] = pred_mode = decode_cabac_mb_chroma_pre_mode(h, sl); - pred_mode= ff_h264_check_intra_pred_mode(h, sl, pred_mode, 1 ); + pred_mode= ff_h264_check_intra_pred_mode(h->avctx, sl->top_samples_available, + sl->left_samples_available, pred_mode, 1 ); if( pred_mode < 0 ) return -1; sl->chroma_pred_mode = pred_mode; } else { -- cgit v1.2.3