Mercurial > libavcodec.hg
changeset 4338:9400cebc4c85 libavcodec
cosmetics: Reorder external libraries.
| author | diego |
|---|---|
| date | Sun, 07 Jan 2007 00:07:10 +0000 |
| parents | 00ed47e631da |
| children | fa7fd2988829 |
| files | Makefile |
| diffstat | 1 files changed, 14 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sun Jan 07 00:02:15 2007 +0000 +++ b/Makefile Sun Jan 07 00:07:10 2007 +0000 @@ -243,28 +243,23 @@ OBJS-$(CONFIG_ADPCM_YAMAHA_DECODER) += adpcm.o OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER) += adpcm.o -OBJS-$(CONFIG_LIBFAAD) += faad.o +# external codec libraries +OBJS-$(CONFIG_LIBA52) += a52dec.o +OBJS-$(CONFIG_LIBA52)$(CONFIG_LIBA52BIN) += liba52/bit_allocate.o \ + liba52/bitstream.o \ + liba52/downmix.o \ + liba52/imdct.o \ + liba52/parse.o \ + liba52/crc.o \ + liba52/resample.o +OBJS-$(CONFIG_LIBDTS) += dtsdec.o OBJS-$(CONFIG_LIBFAAC) += faac.o -OBJS-$(CONFIG_XVID) += xvidff.o xvid_rc.o -OBJS-$(CONFIG_X264) += x264.o +OBJS-$(CONFIG_LIBFAAD) += faad.o +OBJS-$(CONFIG_LIBGSM) += libgsm.o OBJS-$(CONFIG_LIBMP3LAME) += mp3lameaudio.o OBJS-$(CONFIG_LIBVORBIS) += oggvorbis.o -OBJS-$(CONFIG_LIBGSM) += libgsm.o - -# currently using liba52 for ac3 decoding -OBJS-$(CONFIG_LIBA52) += a52dec.o - -# using builtin liba52 or runtime linked liba52.so.0 -OBJS-$(CONFIG_LIBA52)$(CONFIG_LIBA52BIN) += liba52/bit_allocate.o \ - liba52/bitstream.o \ - liba52/downmix.o \ - liba52/imdct.o \ - liba52/parse.o \ - liba52/crc.o \ - liba52/resample.o - -# currently using libdts for dts decoding -OBJS-$(CONFIG_LIBDTS) += dtsdec.o +OBJS-$(CONFIG_X264) += x264.o +OBJS-$(CONFIG_XVID) += xvidff.o xvid_rc.o OBJS-$(CONFIG_AMR) += amr.o OBJS-$(CONFIG_AMR_NB) += amr_float/sp_dec.o \