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 /libavcodec | |
| 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 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 9 | ||||
| -rw-r--r-- | libavcodec/allcodecs.c | 6 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 4 |
3 files changed, 17 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 3b424d8c09..1df461711e 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -118,10 +118,17 @@ OBJS += mp3lameaudio.o EXTRALIBS += -lmp3lame endif -ifeq ($(CONFIG_VORBIS),yes) +ifeq ($(CONFIG_LIBOGG),yes) +EXTRALIBS += -logg +ifeq ($(CONFIG_LIBVORBIS),yes) OBJS += oggvorbis.o EXTRALIBS += -lvorbis -lvorbisenc endif +ifeq ($(CONFIG_LIBTHEORA), yes) +OBJS += oggtheora.o +EXTRALIBS += -ltheora +endif +endif ifeq ($(TARGET_GPROF),yes) CFLAGS+=-p diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index b7a05bd26d..1eea98a743 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -45,10 +45,14 @@ void avcodec_register_all(void) #ifdef CONFIG_MP3LAME register_avcodec(&mp3lame_encoder); #endif -#ifdef CONFIG_VORBIS +#ifdef CONFIG_LIBVORBIS register_avcodec(&oggvorbis_encoder); register_avcodec(&oggvorbis_decoder); #endif +#ifdef CONFIG_LIBTHEORA + register_avcodec(&oggtheora_encoder); + register_avcodec(&oggtheora_decoder); +#endif #ifdef CONFIG_FAAC register_avcodec(&faac_encoder); #endif diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 1ff8363774..2a02473928 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -165,6 +165,8 @@ enum CodecID { CODEC_ID_MP3ADU, CODEC_ID_MP3ON4, + CODEC_ID_OGGTHEORA= 0x16000, + CODEC_ID_MPEG2TS= 0x20000, /* _FAKE_ codec to indicate a raw MPEG2 transport stream (only used by libavformat) */ }; @@ -1877,6 +1879,7 @@ extern AVCodec ac3_encoder; extern AVCodec mp2_encoder; extern AVCodec mp3lame_encoder; extern AVCodec oggvorbis_encoder; +extern AVCodec oggtheora_encoder; extern AVCodec faac_encoder; extern AVCodec xvid_encoder; extern AVCodec mpeg1video_encoder; @@ -1954,6 +1957,7 @@ extern AVCodec mace6_decoder; extern AVCodec huffyuv_decoder; extern AVCodec ffvhuff_decoder; extern AVCodec oggvorbis_decoder; +extern AVCodec oggtheora_decoder; extern AVCodec cyuv_decoder; extern AVCodec h264_decoder; extern AVCodec indeo3_decoder; |