--- iaxclient-2.1beta3/lib/codec_ffmpeg.c	2008-04-07 09:05:42.000000000 -0700
+++ iaxclient-2.1beta3/lib/codec_ffmpeg.c.new	2008-12-27 20:18:19.000000000 -0800
@@ -23,11 +23,7 @@
 #include "codec_ffmpeg.h"
 #include "iaxclient_lib.h"
 
-#ifdef WIN32
 #include "libavcodec/avcodec.h"
-#else
-#include <ffmpeg/avcodec.h>
-#endif
 
 struct slice_header_t
 {
--- iaxclient-2.1beta3/lib/Makefile.am	2008-04-07 09:05:42.000000000 -0700
+++ iaxclient-2.1beta3/lib/Makefile.am.new	2008-12-27 20:23:49.000000000 -0800
@@ -97,7 +97,7 @@
 if FFMPEG
 SRCS += codec_ffmpeg.c codec_ffmpeg.h
 libiaxclient_la_LIBADD += $(FFMPEG_LIBS)
-AM_CFLAGS += $(FFMPEG_CFLAGS)
+AM_CFLAGS += $(FFMPEG_CFLAGS) -lavutil
 endif
 
 SRCS_LIBGSM=					\