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/svq3.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'libavcodec/svq3.c') diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 2bb957d94c..0d96abd157 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -771,7 +771,9 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) i4x4[6] = i4x4_cache[7 + 8 * 1]; if (mb_type == 8) { - ff_h264_check_intra4x4_pred_mode(h, sl); + ff_h264_check_intra4x4_pred_mode(sl->intra4x4_pred_mode_cache, + h->avctx, sl->top_samples_available, + sl->left_samples_available); sl->top_samples_available = (s->mb_y == 0) ? 0x33FF : 0xFFFF; sl->left_samples_available = (s->mb_x == 0) ? 0x5F5F : 0xFFFF; @@ -788,7 +790,8 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) dir = ff_h264_i_mb_type_info[mb_type - 8].pred_mode; dir = (dir >> 1) ^ 3 * (dir & 1) ^ 1; - if ((sl->intra16x16_pred_mode = ff_h264_check_intra_pred_mode(h, sl, dir, 0)) < 0) { + if ((sl->intra16x16_pred_mode = ff_h264_check_intra_pred_mode(h->avctx, sl->top_samples_available, + sl->left_samples_available, dir, 0)) < 0) { av_log(h->avctx, AV_LOG_ERROR, "ff_h264_check_intra_pred_mode < 0\n"); return sl->intra16x16_pred_mode; } @@ -892,7 +895,8 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) h->cur_pic.mb_type[mb_xy] = mb_type; if (IS_INTRA(mb_type)) - sl->chroma_pred_mode = ff_h264_check_intra_pred_mode(h, sl, DC_PRED8x8, 1); + sl->chroma_pred_mode = ff_h264_check_intra_pred_mode(h->avctx, sl->top_samples_available, + sl->left_samples_available, DC_PRED8x8, 1); return 0; } -- cgit v1.2.3