diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 11:45:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 11:45:50 +0100 |
| commit | 016c00cf68a481000f48ece6c11f622ba65e8045 (patch) | |
| tree | 3024981d4018459edd50878c4bfce934b02d1aac /libavcodec/mpeg12.h | |
| parent | 385ffc7650d2661b651f466f18045c2edc30b11a (diff) | |
| parent | 1b6d66745ac1768adb387c2227cdcf4452271149 (diff) | |
| download | ffmpeg-016c00cf68a481000f48ece6c11f622ba65e8045.tar.gz | |
Merge commit '1b6d66745ac1768adb387c2227cdcf4452271149'
* commit '1b6d66745ac1768adb387c2227cdcf4452271149':
Split MPEG-1/2 decoder code off from MPEG-1/2 common code
Conflicts:
libavcodec/Makefile
libavcodec/mpeg12.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg12.h')
| -rw-r--r-- | libavcodec/mpeg12.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h index e4c3b6f78b..a0b906d4b0 100644 --- a/libavcodec/mpeg12.h +++ b/libavcodec/mpeg12.h @@ -25,10 +25,21 @@ #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; typedef struct Mpeg1Context { MpegEncContext mpeg_enc_ctx; |