summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_mkv.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/demux_mkv.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/demux_mkv.c')
-rw-r--r--libmpdemux/demux_mkv.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index 33337548b9..70c8b89f4d 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -39,13 +39,8 @@
#include <zlib.h>
#endif
-#ifdef USE_LIBAVUTIL_SO
-#include <ffmpeg/lzo.h>
-#include <ffmpeg/intreadwrite.h>
-#else
#include "libavutil/lzo.h"
#include "libavutil/intreadwrite.h"
-#endif
#include "libavutil/avstring.h"
static unsigned char sipr_swaps[38][2]={