diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-08 02:04:43 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-08 02:13:09 +0300 |
commit | 17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069 (patch) | |
tree | 5d1910a2ab6381f6b4fb0ffc2834f55f7fef7129 /libmpdemux/demuxer.c | |
parent | 2ba9df3df3d61a7cc1bde9f897bc77eaaf14b383 (diff) | |
parent | af76be6e197382af491fadef3fcf821a721c99f5 (diff) | |
download | mpv-17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069.tar.bz2 mpv-17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069.tar.xz |
Merge svn changes up to r27441
Conflicts:
cfg-common-opts.h
command.c
configure
input/input.c
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libmpdemux/stheader.h
libvo/sub.c
libvo/video_out.c
libvo/vo_xv.c
libvo/vosub_vidix.c
libvo/x11_common.c
libvo/x11_common.h
mp_core.h
mplayer.c
stream/stream.h
Diffstat (limited to 'libmpdemux/demuxer.c')
-rw-r--r-- | libmpdemux/demuxer.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 6d27566d71..7c55ddcab7 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -111,7 +111,7 @@ const demuxer_desc_t *const demuxer_list[] = { &demuxer_desc_fli, &demuxer_desc_film, &demuxer_desc_roq, -#ifdef HAVE_GIF +#ifdef CONFIG_GIF &demuxer_desc_gif, #endif #ifdef CONFIG_OGGVORBIS @@ -131,16 +131,16 @@ const demuxer_desc_t *const demuxer_list[] = { &demuxer_desc_h264_es, &demuxer_desc_audio, &demuxer_desc_mpeg_ty, -#ifdef STREAMING_LIVE555 +#ifdef CONFIG_LIVE555 &demuxer_desc_rtp, #endif -#ifdef LIBNEMESI +#ifdef CONFIG_LIBNEMESI &demuxer_desc_rtp_nemesi, #endif #ifdef CONFIG_LIBAVFORMAT &demuxer_desc_lavf, #endif -#ifdef MUSEPACK +#ifdef CONFIG_MUSEPACK &demuxer_desc_mpc, #endif #ifdef CONFIG_LIBDV095 @@ -150,7 +150,7 @@ const demuxer_desc_t *const demuxer_list[] = { #ifdef CONFIG_LIBNUT &demuxer_desc_nut, #endif -#ifdef HAVE_XMMS +#ifdef CONFIG_XMMS &demuxer_desc_xmms, #endif /* Please do not add any new demuxers here. If you want to implement a new |