diff options
| author | Diego Biurrun <diego@biurrun.de> | 2013-08-19 14:24:45 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2016-03-25 15:56:14 +0100 |
| commit | a7da517f6a5c472f46f67dd33bb6b95ccc919923 (patch) | |
| tree | 4d81c15ee42203fc381ffba5f763e1e8278723a4 /libavcodec/svq3.c | |
| parent | f4d581cda3897f66c1dda7586b93f86a591dbbef (diff) | |
h264data: Move all data tables from a header to a .c file
Diffstat (limited to 'libavcodec/svq3.c')
| -rw-r--r-- | libavcodec/svq3.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 5208317afa..b91099c0ff 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -47,10 +47,8 @@ #include "avcodec.h" #include "mpegutils.h" #include "h264.h" - -#include "h264data.h" // FIXME FIXME FIXME - #include "h264_mvpred.h" +#include "h264data.h" #include "golomb.h" #include "hpeldsp.h" #include "mathops.h" @@ -241,7 +239,7 @@ static inline int svq3_decode_block(GetBitContext *gb, int16_t *block, int index, const int type) { static const uint8_t *const scan_patterns[4] = { - luma_dc_zigzag_scan, ff_zigzag_scan, svq3_scan, chroma_dc_scan + luma_dc_zigzag_scan, ff_zigzag_scan, svq3_scan, ff_h264_chroma_dc_scan }; int run, level, limit; @@ -663,7 +661,7 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) mb_type = MB_TYPE_INTRA4x4; } else { /* INTRA16x16 */ - dir = i_mb_type_info[mb_type - 8].pred_mode; + 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) { @@ -671,7 +669,7 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) return sl->intra16x16_pred_mode; } - cbp = i_mb_type_info[mb_type - 8].cbp; + cbp = ff_h264_i_mb_type_info[mb_type - 8].cbp; mb_type = MB_TYPE_INTRA16x16; } @@ -699,8 +697,8 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) return -1; } - cbp = IS_INTRA(mb_type) ? golomb_to_intra4x4_cbp[vlc] - : golomb_to_inter_cbp[vlc]; + cbp = IS_INTRA(mb_type) ? ff_h264_golomb_to_intra4x4_cbp[vlc] + : ff_h264_golomb_to_inter_cbp[vlc]; } if (IS_INTRA16x16(mb_type) || (h->pict_type != AV_PICTURE_TYPE_I && s->adaptive_quant && cbp)) { @@ -828,7 +826,7 @@ static int svq3_decode_slice_header(AVCodecContext *avctx) return -1; } - sl->slice_type = golomb_to_pict_type[slice_id]; + sl->slice_type = ff_h264_golomb_to_pict_type[slice_id]; if ((header & 0x9F) == 2) { i = (h->mb_num < 64) ? 6 : (1 + av_log2(h->mb_num - 1)); |