diff options
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 2 | ||||
| -rw-r--r-- | libavformat/allformats.c | 2 | ||||
| -rw-r--r-- | libavformat/nut.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index d41aabbabe..5ecd750f5a 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -67,7 +67,7 @@ OBJS+= barpainet.o endif endif -ifeq ($(CONFIG_VORBIS),yes) +ifeq ($(CONFIG_LIBOGG),yes) OBJS+= ogg.o endif diff --git a/libavformat/allformats.c b/libavformat/allformats.c index fd5877c905..bc7eff5066 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -82,7 +82,7 @@ void av_register_all(void) #endif yuv4mpeg_init(); -#ifdef CONFIG_VORBIS +#ifdef CONFIG_LIBOGG ogg_init(); #endif diff --git a/libavformat/nut.c b/libavformat/nut.c index 46fbee8aee..f43797582d 100644 --- a/libavformat/nut.c +++ b/libavformat/nut.c @@ -1433,7 +1433,7 @@ static AVOutputFormat nut_oformat = { "video/x-nut", "nut", sizeof(NUTContext), -#ifdef CONFIG_VORBIS +#ifdef CONFIG_LIBVORBIS CODEC_ID_VORBIS, #elif defined(CONFIG_MP3LAME) CODEC_ID_MP3, |