summaryrefslogtreecommitdiffstats
path: root/libmpdemux/video.c
diff options
context:
space:
mode:
authornicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-01-08 14:03:42 +0000
committernicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-01-08 14:03:42 +0000
commitf774739df9ab4fcc07d1481156a3aea176e66753 (patch)
tree33248cc8e4a29a3b32ea50d407b193882b184114 /libmpdemux/video.c
parent3b31501ff75798db5cf841f62e9cac535af9eceb (diff)
downloadmpv-f774739df9ab4fcc07d1481156a3aea176e66753.tar.bz2
mpv-f774739df9ab4fcc07d1481156a3aea176e66753.tar.xz
include the right avcodec.h, consistently with the rest of mplayer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17344 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/video.c')
-rw-r--r--libmpdemux/video.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libmpdemux/video.c b/libmpdemux/video.c
index f03b246fe2..89415fe944 100644
--- a/libmpdemux/video.c
+++ b/libmpdemux/video.c
@@ -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