summaryrefslogtreecommitdiffstats
path: root/libmpdemux/video.c
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-02-25 15:46:36 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-02-25 15:46:36 +0000
commit21c200e767312f3fe2d335a3e4cb2597cfdd0cfb (patch)
tree1f33c99f5ede0b741d5264726b6f8a1ab4488119 /libmpdemux/video.c
parent9c30916c7a74ad1d3e05ff18648948d138633962 (diff)
downloadmpv-21c200e767312f3fe2d335a3e4cb2597cfdd0cfb.tar.bz2
mpv-21c200e767312f3fe2d335a3e4cb2597cfdd0cfb.tar.xz
FFmpeg now uses different (unified) #include paths.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26101 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/video.c')
-rw-r--r--libmpdemux/video.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libmpdemux/video.c b/libmpdemux/video.c
index 311b72d9ed..fe69c7bf84 100644
--- a/libmpdemux/video.c
+++ b/libmpdemux/video.c
@@ -22,9 +22,7 @@
/* sub_cc (closed captions)*/
#include "sub_cc.h"
-#ifdef USE_LIBAVCODEC_SO
-#include <ffmpeg/avcodec.h>
-#elif defined(USE_LIBAVCODEC)
+#ifdef USE_LIBAVCODEC
#include "libavcodec/avcodec.h"
#else
#define FF_INPUT_BUFFER_PADDING_SIZE 8