Mercurial > libavcodec.hg

diff msmpeg4.c @ 10803:4605bd2fdb7f libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Split the mpeg4 encoder and decoder off h263.c
author michael
date Thu, 07 Jan 2010 23:53:49 +0000
parents f108c5d10793
children 9abebeca7d1b
line wrap: on
line diff
--- a/msmpeg4.c	Thu Jan 07 22:48:58 2010 +0000
+++ b/msmpeg4.c	Thu Jan 07 23:53:49 2010 +0000
@@ -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 @@
 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;