summaryrefslogtreecommitdiff
path: root/libavcodec/msmpeg4.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-01-07 23:53:49 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-01-07 23:53:49 +0000
commitca334dd14b957c4af7fcab5e97b6ed675c97caad (patch)
treedd6bfecae0337a32bf00ca80a08dd33d2a8299f8 /libavcodec/msmpeg4.c
parent84f0aba18dc8815c5cd408238909e4dc8b60684f (diff)
Split the mpeg4 encoder and decoder off h263.c
Originally committed as revision 21079 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/msmpeg4.c')
-rw-r--r--libavcodec/msmpeg4.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c
index 3d1f4740c3..e8d74da333 100644
--- a/libavcodec/msmpeg4.c
+++ b/libavcodec/msmpeg4.c
@@ -32,6 +32,8 @@
#include "mpegvideo.h"
#include "msmpeg4.h"
#include "libavutil/x86_cpu.h"
+#include "h263.h"
+#include "mpeg4video.h"
/*
* You can also call this codec : MPEG4 with a twist !
@@ -43,7 +45,6 @@
//#define DEBUG
#define DC_VLC_BITS 9
-#define CBPY_VLC_BITS 6
#define V1_INTRA_CBPC_VLC_BITS 6
#define V1_INTER_CBPC_VLC_BITS 6
#define V2_INTRA_CBPC_VLC_BITS 3
@@ -1059,7 +1060,6 @@ else
VLC ff_mb_non_intra_vlc[4];
static VLC v2_dc_lum_vlc;
static VLC v2_dc_chroma_vlc;
-static VLC cbpy_vlc;
static VLC v2_intra_cbpc_vlc;
static VLC v2_mb_type_vlc;
static VLC v2_mv_vlc;