diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 20:57:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 20:57:37 +0200 |
| commit | 218f58a16a3dd6c1b3eecef18bb45c04439c7799 (patch) | |
| tree | 98205644fd62945cb1ed816744dacc4193941b4d /libavcodec/h263.h | |
| parent | 58f63670e173c1113ab231850572be303a21faef (diff) | |
| parent | e3d0f49abb20a551bf6d885f75c354d6d0bbeb9d (diff) | |
Merge commit 'e3d0f49abb20a551bf6d885f75c354d6d0bbeb9d'
* commit 'e3d0f49abb20a551bf6d885f75c354d6d0bbeb9d':
mpegvideo: h263: Move all tables to a single file
Conflicts:
libavcodec/h263.h
libavcodec/h263data.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h263.h')
| -rw-r--r-- | libavcodec/h263.h | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/libavcodec/h263.h b/libavcodec/h263.h index 1f954cdf6f..904073e2f9 100644 --- a/libavcodec/h263.h +++ b/libavcodec/h263.h @@ -24,6 +24,7 @@ #include "libavutil/rational.h" #include "get_bits.h" #include "mpegvideo.h" +#include "h263data.h" #include "rl.h" #if !FF_API_ASPECT_EXTENDED @@ -42,39 +43,10 @@ #define H263_GOB_HEIGHT(h) ((h) <= 400 ? 1 : (h) <= 800 ? 2 : 4) -extern const AVRational ff_h263_pixel_aspect[16]; -extern const uint8_t ff_h263_cbpy_tab[16][2]; - -extern const uint8_t ff_cbpc_b_tab[4][2]; - -extern const uint8_t ff_mvtab[33][2]; - -extern const uint8_t ff_h263_intra_MCBPC_code[9]; -extern const uint8_t ff_h263_intra_MCBPC_bits[9]; - -extern const uint8_t ff_h263_inter_MCBPC_code[28]; -extern const uint8_t ff_h263_inter_MCBPC_bits[28]; -extern const uint8_t ff_h263_mbtype_b_tab[15][2]; - extern VLC ff_h263_intra_MCBPC_vlc; extern VLC ff_h263_inter_MCBPC_vlc; extern VLC ff_h263_cbpy_vlc; -extern const uint16_t ff_inter_vlc[103][2]; -extern const int8_t ff_inter_level[102]; -extern const int8_t ff_inter_run[102]; - -extern RLTable ff_h263_rl_inter; - -extern RLTable ff_rl_intra_aic; - -extern const uint16_t ff_h263_format[8][2]; -extern const uint8_t ff_modified_quant_tab[2][32]; -extern const uint16_t ff_mba_max[6]; -extern const uint8_t ff_mba_length[7]; - -extern uint8_t ff_h263_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3]; - extern const enum AVPixelFormat ff_h263_hwaccel_pixfmt_list_420[]; |