diff options
| author | Nilesh Bansal <nileshbansal@gmail.com> | 2005-02-24 15:18:02 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-02-24 15:18:02 +0000 |
| commit | 5c5dea3f0c495e371faa2962cde83dc187bdf2e4 (patch) | |
| tree | 79114f92e1f67bd8b55a24423132f2debebf3082 /libavformat | |
| parent | 738386a5ed5eff0dbad36c33ff96b3b3d4d80af6 (diff) | |
01-makefile_fix_updated.patch
Adds --enable-theora/--enable-vorbis/--enable-ogg to configure
If compiled WITHOUT --enable-theora, native VP3 decoder is used
patch by (Nilesh Bansal <nileshbansal gmail com>)
Originally committed as revision 3975 to svn://svn.ffmpeg.org/ffmpeg/trunk
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, |