--- xvidcap-1.1.7-orig/src/main.c	2008-10-21 00:27:54.000000000 +0200
+++ xvidcap-1.1.7/src/main.c	2008-10-21 00:28:17.000000000 +0200
@@ -217,9 +217,6 @@
 
     if (app)
         xvc_appdata_free (app);
-#ifdef USE_FFMPEG
-    av_free_static ();
-#endif
 }
 
 /**
--- xvidcap-1.1.7-orig/src/xtoffmpeg.c	2008-10-21 00:08:19.000000000 +0200
+++ xvidcap-1.1.7/src/xtoffmpeg.c	2008-10-21 00:11:00.000000000 +0200
@@ -1248,7 +1248,11 @@
     st->codec->flags |= CODEC_FLAG2_FAST;
     // there is no trellis quantiser in libav* for mjpeg
     if (st->codec->codec_id != CODEC_ID_MJPEG)
+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
         st->codec->flags |= CODEC_FLAG_TRELLIS_QUANT;
+#else
+		st->codec->trellis = 1;
+#endif
     st->codec->flags &= ~CODEC_FLAG_OBMC;
     // some formats want stream headers to be seperate
     if (oc->oformat->flags & AVFMT_GLOBALHEADER)