diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 21:33:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 21:34:22 +0200 |
| commit | d52c5e9d75e92dfb2a304d523567e201f2393047 (patch) | |
| tree | 4d6b1e5a9ed3b46ca037eae4dce912a4883dfb90 /libavcodec/mpeg12.h | |
| parent | dbf172e6f44d1736d27a84fa117dcd6b8460bd4b (diff) | |
| parent | 8606e881b02bec2ac24943d22c8afe11d641fac8 (diff) | |
| download | ffmpeg-d52c5e9d75e92dfb2a304d523567e201f2393047.tar.gz | |
Merge commit '8606e881b02bec2ac24943d22c8afe11d641fac8'
* commit '8606e881b02bec2ac24943d22c8afe11d641fac8':
mpeg12: Move the vlc bits to a stand alone file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg12.h')
| -rw-r--r-- | libavcodec/mpeg12.h | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h index 118410f6fd..16ca195a47 100644 --- a/libavcodec/mpeg12.h +++ b/libavcodec/mpeg12.h @@ -22,29 +22,12 @@ #ifndef AVCODEC_MPEG12_H #define AVCODEC_MPEG12_H +#include "mpeg12vlc.h" #include "mpegvideo.h" -#define DC_VLC_BITS 9 -#define MV_VLC_BITS 9 -#define TEX_VLC_BITS 9 - -#define MBINCR_VLC_BITS 9 -#define MB_PAT_VLC_BITS 9 -#define MB_PTYPE_VLC_BITS 6 -#define MB_BTYPE_VLC_BITS 6 - -extern VLC ff_dc_lum_vlc; -extern VLC ff_dc_chroma_vlc; -extern VLC ff_mbincr_vlc; -extern VLC ff_mb_ptype_vlc; -extern VLC ff_mb_btype_vlc; -extern VLC ff_mb_pat_vlc; -extern VLC ff_mv_vlc; - extern uint8_t ff_mpeg12_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3]; void ff_mpeg12_common_init(MpegEncContext *s); -void ff_mpeg12_init_vlcs(void); static inline int decode_dc(GetBitContext *gb, int component) { |