Mercurial > mplayer.hg
diff libmpdemux/demuxer.c @ 17354:60189cd9bbc8
added support for external libavformat
author | nicodvb |
---|---|
date | Mon, 09 Jan 2006 19:35:44 +0000 |
parents | a1b8eeffdfcd |
children | 934380353fd6 |
line wrap: on
line diff
--- a/libmpdemux/demuxer.c Mon Jan 09 15:44:15 2006 +0000 +++ b/libmpdemux/demuxer.c Mon Jan 09 19:35:44 2006 +0000 @@ -62,7 +62,9 @@ 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 @@ #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,