Mercurial > libavcodec.hg
changeset 3:1bdbd869c1f0 libavcodec
added CONFIG_AC3, CONFIG_MPGLIB, CONFIG_DECODERS and CONFIG_ENCODERS (Arpi: don't forget to put CONFIG_DECODERS in mplayer)
| author | glantau |
|---|---|
| date | Mon, 23 Jul 2001 20:58:31 +0000 |
| parents | 2e2c46c87460 |
| children | b8374040680d |
| files | Makefile ac3dec.c avcodec.h utils.c |
| diffstat | 4 files changed, 23 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Mon Jul 23 20:06:54 2001 +0000 +++ b/Makefile Mon Jul 23 20:58:31 2001 +0000 @@ -10,14 +10,18 @@ ASM_OBJS= # currently using libac3 for ac3 decoding +ifeq ($(CONFIG_AC3),yes) OBJS+= ac3dec.o \ libac3/bit_allocate.o libac3/bitstream.o libac3/downmix.o \ libac3/imdct.o libac3/parse.o +endif # currently using mpglib for mpeg audio decoding +ifeq ($(CONFIG_MPGLIB),yes) OBJS+= mpegaudiodec.o \ mpglib/layer1.o mpglib/layer2.o mpglib/layer3.o \ mpglib/dct64_i386.o mpglib/decode_i386.o mpglib/tabinit.o +endif # i386 mmx specific stuff ifeq ($(TARGET_MMX),yes) @@ -71,3 +75,10 @@ dct-test: dct-test.o jfdctfst.o i386/fdct_mmx.o i386/fdctdata.o fdctref.o $(CC) -o $@ $^ + +# +# include dependency files if they exist +# +ifneq ($(wildcard .depend),) +include .depend +endif
--- a/ac3dec.c Mon Jul 23 20:06:54 2001 +0000 +++ b/ac3dec.c Mon Jul 23 20:58:31 2001 +0000 @@ -178,12 +178,3 @@ ac3_decode_end, ac3_decode_frame, }; - -/* register codecs which could clash with mplayer symbols */ -/* XXX: rename all symbols to avoid clashed */ -void avcodec_register_more(void) -{ - register_avcodec(&mp3_decoder); - register_avcodec(&ac3_decoder); -} -
--- a/avcodec.h Mon Jul 23 20:06:54 2001 +0000 +++ b/avcodec.h Mon Jul 23 20:58:31 2001 +0000 @@ -174,4 +174,3 @@ int avcodec_close(AVCodecContext *avctx); void avcodec_register_all(void); -void avcodec_register_more(void);
--- a/utils.c Mon Jul 23 20:06:54 2001 +0000 +++ b/utils.c Mon Jul 23 20:58:31 2001 +0000 @@ -244,6 +244,8 @@ /* simple call to use all the codecs */ void avcodec_register_all(void) { + /* encoders */ +#ifdef CONFIG_ENCODERS register_avcodec(&ac3_encoder); register_avcodec(&mp2_encoder); register_avcodec(&mpeg1video_encoder); @@ -253,15 +255,25 @@ register_avcodec(&mjpeg_encoder); register_avcodec(&opendivx_encoder); register_avcodec(&msmpeg4_encoder); +#endif /* CONFIG_ENCODERS */ register_avcodec(&pcm_codec); register_avcodec(&rawvideo_codec); + /* decoders */ +#ifdef CONFIG_DECODERS register_avcodec(&h263_decoder); register_avcodec(&opendivx_decoder); register_avcodec(&msmpeg4_decoder); register_avcodec(&mpeg_decoder); register_avcodec(&h263i_decoder); register_avcodec(&rv10_decoder); +#ifdef CONFIG_MPGLIB + register_avcodec(&mp3_decoder); +#endif +#ifdef CONFIG_AC3 + register_avcodec(&ac3_decoder); +#endif +#endif /* CONFIG_DECODERS */ } static int encode_init(AVCodecContext *s)