diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-01-07 00:07:10 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-01-07 00:07:10 +0000 |
| commit | 20c9dfe391aa6a634242f2c77d30d5c82340511a (patch) | |
| tree | b6469e2337350667aebd1e1f498bed6c4af73d4f /libavcodec/Makefile | |
| parent | 6ebe07fbb55e78ed72781deb2fe263ab86135f30 (diff) | |
| download | ffmpeg-20c9dfe391aa6a634242f2c77d30d5c82340511a.tar.gz | |
cosmetics: Reorder external libraries.
Originally committed as revision 7418 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index c2f330eef1..3322453860 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -243,28 +243,23 @@ OBJS-$(CONFIG_ADPCM_XA_ENCODER) += adpcm.o OBJS-$(CONFIG_ADPCM_YAMAHA_DECODER) += adpcm.o OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER) += adpcm.o -OBJS-$(CONFIG_LIBFAAD) += faad.o -OBJS-$(CONFIG_LIBFAAC) += faac.o -OBJS-$(CONFIG_XVID) += xvidff.o xvid_rc.o -OBJS-$(CONFIG_X264) += x264.o -OBJS-$(CONFIG_LIBMP3LAME) += mp3lameaudio.o -OBJS-$(CONFIG_LIBVORBIS) += oggvorbis.o -OBJS-$(CONFIG_LIBGSM) += libgsm.o - -# currently using liba52 for ac3 decoding +# external codec libraries 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 + 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_LIBFAAD) += faad.o +OBJS-$(CONFIG_LIBGSM) += libgsm.o +OBJS-$(CONFIG_LIBMP3LAME) += mp3lameaudio.o +OBJS-$(CONFIG_LIBVORBIS) += oggvorbis.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 \ |