diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-02 22:04:35 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-02 22:04:35 +0300 |
commit | 6cce822505c0a76ac520909a895021b8f5b7e5ab (patch) | |
tree | f8ba954c698470208a243be3da216f7f54367f46 /libmpdemux/demuxer.c | |
parent | 04f3909a724a06ca5a5a3921061f2ba9fb9d8787 (diff) | |
parent | ded7033671fb7d84fbdb67ace46c1fc8833631bc (diff) | |
download | mpv-6cce822505c0a76ac520909a895021b8f5b7e5ab.tar.bz2 mpv-6cce822505c0a76ac520909a895021b8f5b7e5ab.tar.xz |
Merge svn changes up to r27399
Conflicts:
libmpcodecs/vd.c
libmpcodecs/ve_raw.c
libvo/video_out.c
libvo/x11_common.c
mplayer.c
Diffstat (limited to 'libmpdemux/demuxer.c')
-rw-r--r-- | libmpdemux/demuxer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 6ca1f4aaa4..6d27566d71 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -114,7 +114,7 @@ const demuxer_desc_t *const demuxer_list[] = { #ifdef HAVE_GIF &demuxer_desc_gif, #endif -#ifdef HAVE_OGGVORBIS +#ifdef CONFIG_OGGVORBIS &demuxer_desc_ogg, #endif #ifdef CONFIG_WIN32DLL @@ -143,11 +143,11 @@ const demuxer_desc_t *const demuxer_list[] = { #ifdef MUSEPACK &demuxer_desc_mpc, #endif -#ifdef HAVE_LIBDV095 +#ifdef CONFIG_LIBDV095 &demuxer_desc_rawdv, #endif &demuxer_desc_aac, -#ifdef HAVE_LIBNUT +#ifdef CONFIG_LIBNUT &demuxer_desc_nut, #endif #ifdef HAVE_XMMS |