summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.c
diff options
context:
space:
mode:
authornicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-01-09 19:35:44 +0000
committernicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-01-09 19:35:44 +0000
commitad978de549f9d227326f54b1e8903f8c270d7e94 (patch)
tree33b7af57b7a2b54b06557e2888fdd641e1e612fc /libmpdemux/demuxer.c
parent0355c449220c676542d1cdf5ace47a57d0c59fe9 (diff)
downloadmpv-ad978de549f9d227326f54b1e8903f8c270d7e94.tar.bz2
mpv-ad978de549f9d227326f54b1e8903f8c270d7e94.tar.xz
added support for external libavformat
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17355 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.c')
-rw-r--r--libmpdemux/demuxer.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index f54a6532b1..3cd17519a7 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -62,7 +62,9 @@ extern demuxer_desc_t demuxer_desc_audio;
extern demuxer_desc_t demuxer_desc_xmms;
extern demuxer_desc_t demuxer_desc_mpeg_ty;
extern demuxer_desc_t demuxer_desc_rtp;
+#if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO)
extern demuxer_desc_t demuxer_desc_lavf;
+#endif
extern demuxer_desc_t demuxer_desc_aac;
demuxer_desc_t* demuxer_list[] = {
@@ -119,7 +121,7 @@ demuxer_desc_t* demuxer_list[] = {
#ifdef STREAMING_LIVE555
&demuxer_desc_rtp,
#endif
-#ifdef USE_LIBAVFORMAT
+#if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO)
&demuxer_desc_lavf,
#endif
&demuxer_desc_aac,