Fix includes for ffmpeg

configure.in

@@ -333,8 +333,6 @@ if test x$have_ffmpeg = xyes; then
 else
    AC_MSG_RESULT(not found)
 fi
-dnl most recent ffmpeg header mess workaround
-FFMPEG_CFLAGS="$FFMPEG_CFLAGS -I/usr/include/ffmpeg/libavutil/ -I/usr/include/ffmpeg/libavformat/ -I/usr/include/ffmpeg/libavcodec/ -I/usr/include/ffmpeg/libswscale -I/usr/include/ffmpeg/"
 AC_SUBST(FFMPEG_LIBS)
 AC_SUBST(FFMPEG_CFLAGS)
 AC_SUBST(SWSCALE_LIBS)

src/include/ffmpeg_encoder.h

@@ -8,8 +8,8 @@
 #include <video_encoder.h>
 
 #ifdef WITH_AVCODEC
-#include <avcodec.h>
-#include <avformat.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
 
 #define STREAM_IS_RAW(avformat_context) \
     (avformat_context->oformat->flags & AVFMT_RAWPICTURE)

src/include/oggtheora_encoder.h

@@ -33,8 +33,8 @@
 
 /*
 extern "C" {
-#include <avcodec.h>
-#include <avformat.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
 }
 */
 

src/include/video_layer.h

@@ -22,10 +22,10 @@
 #include <config.h>
 
 extern "C" {
-#include <avcodec.h>
-#include <avformat.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
 #ifdef WITH_SWSCALE
-#include <swscale.h>
+#include <libswscale/swscale.h>
 #endif
 }
 #include <layer.h>