Mercurial > mplayer.hg

diff libmpdemux/demux_lavf.c @ 17354:60189cd9bbc8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added support for external libavformat
author nicodvb
date Mon, 09 Jan 2006 19:35:44 +0000
parents 044260623695
children 401b440a6d76
line wrap: on
line diff
--- a/libmpdemux/demux_lavf.c	Mon Jan 09 15:44:15 2006 +0000
+++ b/libmpdemux/demux_lavf.c	Mon Jan 09 19:35:44 2006 +0000
@@ -28,10 +28,12 @@
 #include "demuxer.h"
 #include "stheader.h"
 
-#ifdef USE_LIBAVFORMAT
-
+#ifdef USE_LIBAVFORMAT_SO
+#include <ffmpeg/avformat.h>
+#else
 #include "avformat.h"
 #include "avi.h"
+#endif
 
 #define PROBE_BUF_SIZE 2048
 
@@ -451,4 +453,3 @@
   demux_lavf_control
 };
 
-#endif // USE_LIBAVFORMAT