XviD Support patch by (Adam Thayer <krevnik at comcast dot net>)

Originally committed as revision 3325 to svn://svn.ffmpeg.org/ffmpeg/trunk

Makefile

@@ -58,6 +58,10 @@ ifeq ($(CONFIG_FAAC),yes)
 EXTRALIBS+=-lfaac
 endif
 
+ifeq ($(CONFIG_XVID),yes)
+EXTRALIBS+=-lxvidcore
+endif
+
 ifeq ($(BUILD_VHOOK),yes)
 VHOOK=videohook
 INSTALLVHOOK=install-vhook

configure

@@ -19,6 +19,7 @@ echo "  --enable-vorbis          enable vorbis support via libvorbisenc [default
 echo "  --enable-faad            enable faad support via libfaad [default=no]"
 echo "  --enable-faadbin         build faad support with runtime linking [default=no]"
 echo "  --enable-faac            enable faac support via libfaac [default=no]"
+echo "  --enable-xvid            enable xvid support via xvidcore [default=no]"
 echo "  --enable-mingw32         enable mingw32 native/cross windows compile"
 echo "  --enable-a52             enable GPL'ed A52 support [default=no]"
 echo "  --enable-a52bin          open liba52.so.0 at runtime [default=no]"
@@ -142,6 +143,7 @@ vorbis="no"
 faad="no"
 faadbin="no"
 faac="no"
+xvid="no"
 a52="no"
 a52bin="no"
 dts="no"
@@ -399,6 +401,8 @@ for opt do
   ;;
   --enable-faac) faac="yes"
   ;;
+  --enable-xvid) xvid="yes"
+  ;;
   --disable-vhook) vhook="no"
   ;;
   --disable-simple_idct) simpleidct="no"
@@ -449,6 +453,11 @@ if test "$gpl" != "yes"; then
         fail="yes"
     fi
 
+    if test "$xvid" != "no"; then
+        echo "libxvidcore is under GPL and --enable-gpl is not specified"
+        fail="yes"
+    fi
+
     if test "$dts" != "no"; then
         echo "libdts is under GPL and --enable-gpl is not specified"
         fail="yes"
@@ -980,6 +989,7 @@ echo "vorbis enabled   $vorbis"
 echo "faad enabled     $faad"
 echo "faadbin enabled  $faadbin"
 echo "faac enabled     $faac"
+echo "xvid enabled     $xvid"
 echo "a52 support      $a52"
 echo "a52 dlopened     $a52bin"
 echo "dts support      $dts"
@@ -1264,6 +1274,11 @@ if test "$faac" = "yes" ; then
   echo "CONFIG_FAAC=yes" >> config.mak
 fi
 
+if test "$xvid" = "yes" ; then
+  echo "#define CONFIG_XVID 1" >> $TMPH
+  echo "CONFIG_XVID=yes" >> config.mak
+fi
+
 if test "$mingw32" = "yes" ; then
   echo "#define CONFIG_WIN32 1" >> $TMPH
   echo "CONFIG_WIN32=yes" >> config.mak

libavcodec/Makefile

@@ -92,6 +92,11 @@ OBJS+= faac.o
 EXTRALIBS += -lfaac
 endif
 
+ifeq ($(CONFIG_XVID),yes)
+OBJS+= xvidff.o
+EXTRALIBS += -lxvidcore
+endif
+
 ifeq ($(CONFIG_PP),yes)
 ifeq ($(SHARED_PP),yes)
 EXTRALIBS += -lpostproc

libavcodec/allcodecs.c

@@ -51,6 +51,9 @@ void avcodec_register_all(void)
 #endif
 #ifdef CONFIG_FAAC
     register_avcodec(&faac_encoder);
+#endif
+#ifdef CONFIG_XVID
+    register_avcodec(&xvid_encoder);
 #endif
     register_avcodec(&mpeg1video_encoder);
 //    register_avcodec(&h264_encoder);

libavcodec/avcodec.h

@@ -142,6 +142,7 @@ enum CodecID {
                          stream (only used by libavformat) */
 
     CODEC_ID_DTS,
+    CODEC_ID_XVID,
 };
 
 /* CODEC_ID_MP3LAME is absolete */
@@ -1724,6 +1725,7 @@ extern AVCodec mp2_encoder;
 extern AVCodec mp3lame_encoder;
 extern AVCodec oggvorbis_encoder;
 extern AVCodec faac_encoder;
+extern AVCodec xvid_encoder;
 extern AVCodec mpeg1video_encoder;
 extern AVCodec mpeg2video_encoder;
 extern AVCodec h263_encoder;