Mercurial > mplayer.hg

diff libmpdemux/demux_lavf.c @ 26069:1318e956c092

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
FFmpeg now uses different (unified) #include paths.
author diego
date Mon, 25 Feb 2008 15:46:36 +0000
parents 6e9c78324790
children 19fa7a56ed04
line wrap: on
line diff
--- a/libmpdemux/demux_lavf.c	Mon Feb 25 09:45:55 2008 +0000
+++ b/libmpdemux/demux_lavf.c	Mon Feb 25 15:46:36 2008 +0000
@@ -31,17 +31,11 @@
 #include "m_option.h"
 #include "libvo/sub.h"
 
-#ifdef USE_LIBAVFORMAT_SO
-#include <ffmpeg/avformat.h>
-#include <ffmpeg/avutil.h>
-#include <ffmpeg/opt.h>
-#else
-#include "avformat.h"
-#include "avutil.h"
-#include "avi.h"
-#include "opt.h"
-#endif
-#include "riff.h"
+#include "libavformat/avformat.h"
+#include "libavutil/avutil.h"
+#include "libavformat/avi.h"
+#include "libavcodec/opt.h"
+#include "libavformat/riff.h"
 
 #define PROBE_BUF_SIZE 2048