Mercurial > libavcodec.hg
changeset 2520:047f7bad4cbb libavcodec
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>)
| author | michael |
|---|---|
| date | Thu, 24 Feb 2005 15:18:02 +0000 |
| parents | b34f2cac6a71 |
| children | d3885f927bc7 |
| files | Makefile allcodecs.c avcodec.h |
| diffstat | 3 files changed, 17 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Thu Feb 24 09:27:46 2005 +0000 +++ b/Makefile Thu Feb 24 15:18:02 2005 +0000 @@ -118,10 +118,17 @@ 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
--- a/allcodecs.c Thu Feb 24 09:27:46 2005 +0000 +++ b/allcodecs.c Thu Feb 24 15:18:02 2005 +0000 @@ -45,10 +45,14 @@ #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
--- a/avcodec.h Thu Feb 24 09:27:46 2005 +0000 +++ b/avcodec.h Thu Feb 24 15:18:02 2005 +0000 @@ -165,6 +165,8 @@ 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 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 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;