diff options
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demuxer.c | 4 | ||||
| -rw-r--r-- | libmpdemux/muxer.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 8775c6882b..96c4f12bb3 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -75,7 +75,7 @@ demuxer_desc_t* demuxer_list[] = { &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 @@ demuxer_desc_t* demuxer_list[] = { #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 diff --git a/libmpdemux/muxer.c b/libmpdemux/muxer.c index f13c7fdd6f..a5ab94e2d5 100644 --- a/libmpdemux/muxer.c +++ b/libmpdemux/muxer.c @@ -36,7 +36,7 @@ muxer_t *muxer_new_muxer(int type,stream_t *stream){ if(! muxer_init_muxer_rawaudio(muxer)) goto fail; break; -#if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO) +#ifdef USE_LIBAVFORMAT case MUXER_TYPE_LAVF: if(! muxer_init_muxer_lavf(muxer)) goto fail; |