comparison Makefile @ 10735:33e796162603 libavcodec

Declare AAC parser dependencies in configure. This affects the AAC decoder, S/PDIF muxer and ADTS to ASC bitstream filter.
author diego
date Tue, 29 Dec 2009 11:42:16 +0000
parents cddb0757c5ca
children 683acf1e6c17
comparison
equal deleted inserted replaced
10734:cddb0757c5ca 10735:33e796162603
36 OBJS-$(CONFIG_RDFT) += rdft.o $(RDFT-OBJS-yes) 36 OBJS-$(CONFIG_RDFT) += rdft.o $(RDFT-OBJS-yes)
37 OBJS-$(CONFIG_VAAPI) += vaapi.o 37 OBJS-$(CONFIG_VAAPI) += vaapi.o
38 OBJS-$(CONFIG_VDPAU) += vdpau.o 38 OBJS-$(CONFIG_VDPAU) += vdpau.o
39 39
40 # decoders/encoders/hardware accelerators 40 # decoders/encoders/hardware accelerators
41 OBJS-$(CONFIG_AAC_DECODER) += aac.o aactab.o mpeg4audio.o \ 41 OBJS-$(CONFIG_AAC_DECODER) += aac.o aactab.o
42 aac_parser.o aac_ac3_parser.o
43 OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o \ 42 OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o \
44 aacpsy.o aactab.o \ 43 aacpsy.o aactab.o \
45 psymodel.o iirfilter.o \ 44 psymodel.o iirfilter.o \
46 mpeg4audio.o 45 mpeg4audio.o
47 OBJS-$(CONFIG_AASC_DECODER) += aasc.o msrledec.o 46 OBJS-$(CONFIG_AASC_DECODER) += aasc.o msrledec.o
454 OBJS-$(CONFIG_MPEGTS_MUXER) += mpegvideo.o 453 OBJS-$(CONFIG_MPEGTS_MUXER) += mpegvideo.o
455 OBJS-$(CONFIG_NUT_MUXER) += mpegaudiodata.o 454 OBJS-$(CONFIG_NUT_MUXER) += mpegaudiodata.o
456 OBJS-$(CONFIG_OGG_DEMUXER) += flacdec.o flacdata.o flac.o 455 OBJS-$(CONFIG_OGG_DEMUXER) += flacdec.o flacdata.o flac.o
457 OBJS-$(CONFIG_OGG_MUXER) += xiph.o flacdec.o flacdata.o flac.o 456 OBJS-$(CONFIG_OGG_MUXER) += xiph.o flacdec.o flacdata.o flac.o
458 OBJS-$(CONFIG_RTP_MUXER) += mpegvideo.o 457 OBJS-$(CONFIG_RTP_MUXER) += mpegvideo.o
459 OBJS-$(CONFIG_SPDIF_MUXER) += aac_parser.o aac_ac3_parser.o \
460 mpeg4audio.o
461 458
462 # external codec libraries 459 # external codec libraries
463 OBJS-$(CONFIG_LIBDIRAC_DECODER) += libdiracdec.o 460 OBJS-$(CONFIG_LIBDIRAC_DECODER) += libdiracdec.o
464 OBJS-$(CONFIG_LIBDIRAC_ENCODER) += libdiracenc.o libdirac_libschro.o 461 OBJS-$(CONFIG_LIBDIRAC_ENCODER) += libdiracenc.o libdirac_libschro.o
465 OBJS-$(CONFIG_LIBFAAC_ENCODER) += libfaac.o 462 OBJS-$(CONFIG_LIBFAAC_ENCODER) += libfaac.o
515 msmpeg4.o msmpeg4data.o h263.o \ 512 msmpeg4.o msmpeg4data.o h263.o \
516 mpegvideo.o error_resilience.o 513 mpegvideo.o error_resilience.o
517 OBJS-$(CONFIG_VP3_PARSER) += vp3_parser.o 514 OBJS-$(CONFIG_VP3_PARSER) += vp3_parser.o
518 515
519 # bitstream filters 516 # bitstream filters
520 OBJS-$(CONFIG_AAC_ADTSTOASC_BSF) += aac_adtstoasc_bsf.o aac_parser.o \ 517 OBJS-$(CONFIG_AAC_ADTSTOASC_BSF) += aac_adtstoasc_bsf.o
521 aac_ac3_parser.o mpeg4audio.o
522 OBJS-$(CONFIG_DUMP_EXTRADATA_BSF) += dump_extradata_bsf.o 518 OBJS-$(CONFIG_DUMP_EXTRADATA_BSF) += dump_extradata_bsf.o
523 OBJS-$(CONFIG_H264_MP4TOANNEXB_BSF) += h264_mp4toannexb_bsf.o 519 OBJS-$(CONFIG_H264_MP4TOANNEXB_BSF) += h264_mp4toannexb_bsf.o
524 OBJS-$(CONFIG_IMX_DUMP_HEADER_BSF) += imx_dump_header_bsf.o 520 OBJS-$(CONFIG_IMX_DUMP_HEADER_BSF) += imx_dump_header_bsf.o
525 OBJS-$(CONFIG_MJPEGA_DUMP_HEADER_BSF) += mjpega_dump_header_bsf.o 521 OBJS-$(CONFIG_MJPEGA_DUMP_HEADER_BSF) += mjpega_dump_header_bsf.o
526 OBJS-$(CONFIG_MOV2TEXTSUB_BSF) += movsub_bsf.o 522 OBJS-$(CONFIG_MOV2TEXTSUB_BSF) += movsub_bsf.o