Mercurial > mplayer.hg

diff libmpdemux/demuxer.c @ 23121:a257dd426da5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify preprocessor directives: There is a general variable for static/shared FFmpeg libraries now.
author diego
date Thu, 26 Apr 2007 15:10:07 +0000
parents 9ee7776ab5a2
children a124f3abc1ec
line wrap: on
line diff
--- a/libmpdemux/demuxer.c	Thu Apr 26 13:26:41 2007 +0000
+++ b/libmpdemux/demuxer.c	Thu Apr 26 15:10:07 2007 +0000
@@ -75,7 +75,7 @@
   &demuxer_desc_tv,
 #endif
   &demuxer_desc_mf,
-#if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO)
+#ifdef USE_LIBAVFORMAT
   &demuxer_desc_lavf_preferred,
 #endif
   &demuxer_desc_avi,
@@ -119,7 +119,7 @@
 #ifdef STREAMING_LIVE555
   &demuxer_desc_rtp,
 #endif
-#if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO)
+#ifdef USE_LIBAVFORMAT
   &demuxer_desc_lavf,
 #endif
 #ifdef HAVE_LIBDV095