# HG changeset patch
# User nicodvb
# Date 1136729022 0
# Node ID b07bb7ee7ce4ac394c7a3ead06c0da43b03472b7
# Parent  adb64d908347a7f4566b8a9cad3a7a71b781bb3b
include the right avcodec.h, consistently with the rest of mplayer

diff -r adb64d908347 -r b07bb7ee7ce4 libmpdemux/demux_asf.c
--- a/libmpdemux/demux_asf.c	Sun Jan 08 13:35:54 2006 +0000
+++ b/libmpdemux/demux_asf.c	Sun Jan 08 14:03:42 2006 +0000
@@ -62,8 +62,10 @@
   *src = dst;
 }
 
-#ifdef USE_LIBAVCODEC
-#include "avcodec.h"
+#ifdef USE_LIBAVCODEC_SO
+#include <ffmpeg/avcodec.h>
+#elif defined(USE_LIBAVCODEC)
+#include "libavcodec/avcodec.h"
 #else
 #define FF_INPUT_BUFFER_PADDING_SIZE 8
 #endif
diff -r adb64d908347 -r b07bb7ee7ce4 libmpdemux/demux_real.c
--- a/libmpdemux/demux_real.c	Sun Jan 08 13:35:54 2006 +0000
+++ b/libmpdemux/demux_real.c	Sun Jan 08 14:03:42 2006 +0000
@@ -32,8 +32,10 @@
 #include "stheader.h"
 #include "bswap.h"
 
-#ifdef USE_LIBAVCODEC
-#include "avcodec.h"
+#ifdef USE_LIBAVCODEC_SO
+#include <ffmpeg/avcodec.h>
+#elif defined(USE_LIBAVCODEC)
+#include "libavcodec/avcodec.h"
 #else
 #define FF_INPUT_BUFFER_PADDING_SIZE 8
 #endif
diff -r adb64d908347 -r b07bb7ee7ce4 libmpdemux/demux_viv.c
--- a/libmpdemux/demux_viv.c	Sun Jan 08 13:35:54 2006 +0000
+++ b/libmpdemux/demux_viv.c	Sun Jan 08 14:03:42 2006 +0000
@@ -15,8 +15,10 @@
 #include "stheader.h"
 #include "bswap.h"
 
-#ifdef USE_LIBAVCODEC
-#include "avcodec.h"
+#ifdef USE_LIBAVCODEC_SO
+#include <ffmpeg/avcodec.h>
+#elif defined(USE_LIBAVCODEC)
+#include "libavcodec/avcodec.h"
 #else
 #define FF_INPUT_BUFFER_PADDING_SIZE 8
 #endif
diff -r adb64d908347 -r b07bb7ee7ce4 libmpdemux/video.c
--- a/libmpdemux/video.c	Sun Jan 08 13:35:54 2006 +0000
+++ b/libmpdemux/video.c	Sun Jan 08 14:03:42 2006 +0000
@@ -22,8 +22,10 @@
 /* sub_cc (closed captions)*/
 #include "sub_cc.h"
 
-#ifdef USE_LIBAVCODEC
-#include "avcodec.h"
+#ifdef USE_LIBAVCODEC_SO
+#include <ffmpeg/avcodec.h>
+#elif defined(USE_LIBAVCODEC)
+#include "libavcodec/avcodec.h"
 #else
 #define FF_INPUT_BUFFER_PADDING_SIZE 8
 #endif