diff options
| author | Anton Khirnov <anton@khirnov.net> | 2016-03-23 09:41:05 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2016-03-28 09:53:56 +0200 |
| commit | ecc31f6b086453ab9811dce2ae5ceb6a7c19e4ad (patch) | |
| tree | 464ce2f788c348470d80603de4bcf5365aa750ef /libavcodec/h264_cavlc.c | |
| parent | 1877712c586df2261f2806f45388c77592b89d1e (diff) | |
| download | ffmpeg-ecc31f6b086453ab9811dce2ae5ceb6a7c19e4ad.tar.gz | |
h264: move ff_h264_check_intra[4x4]_pred_mode() to h264_parse
It is shared with svq3.
Diffstat (limited to 'libavcodec/h264_cavlc.c')
| -rw-r--r-- | libavcodec/h264_cavlc.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c index 45a838603e..bdd9f73975 100644 --- a/libavcodec/h264_cavlc.c +++ b/libavcodec/h264_cavlc.c @@ -818,15 +818,18 @@ decode_intra_mb: sl->intra4x4_pred_mode_cache[scan8[i]] = mode; } write_back_intra_pred_mode(h, sl); - if (ff_h264_check_intra4x4_pred_mode(h, sl) < 0) + 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){ - pred_mode= ff_h264_check_intra_pred_mode(h, sl, get_ue_golomb_31(&sl->gb), 1); + pred_mode= ff_h264_check_intra_pred_mode(h->avctx, sl->top_samples_available, + sl->left_samples_available, get_ue_golomb_31(&sl->gb), 1); if(pred_mode < 0) return -1; sl->chroma_pred_mode = pred_mode; |