diff options
| author | Alex Converse <alex.converse@gmail.com> | 2010-06-22 19:29:03 +0000 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2010-06-22 19:29:03 +0000 |
| commit | fd6eb4a06c31e518060e27a818b8acf4410be94a (patch) | |
| tree | 04033adc5b3df5d7b221b79aaca330187732becf /libavcodec/Makefile | |
| parent | 3b636f21daa6996e20ef97131a1c3649c3043304 (diff) | |
| download | ffmpeg-fd6eb4a06c31e518060e27a818b8acf4410be94a.tar.gz | |
Move Parametric Stereo related ps* files to aacps*.
Originally committed as revision 23720 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 1f4ee8bd76..6d7f5639f2 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -42,7 +42,7 @@ OBJS-$(CONFIG_VAAPI) += vaapi.o OBJS-$(CONFIG_VDPAU) += vdpau.o # decoders/encoders/hardware accelerators -OBJS-$(CONFIG_AAC_DECODER) += aacdec.o aactab.o aacsbr.o ps.o +OBJS-$(CONFIG_AAC_DECODER) += aacdec.o aactab.o aacsbr.o aacps.o OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o \ aacpsy.o aactab.o \ psymodel.o iirfilter.o \ @@ -668,6 +668,6 @@ $(SUBDIR)mpegaudiodec.o: $(SUBDIR)mpegaudio_tables.h $(SUBDIR)mpegaudiodec_float.o: $(SUBDIR)mpegaudio_tables.h $(SUBDIR)motionpixels.o: $(SUBDIR)motionpixels_tables.h $(SUBDIR)pcm.o: $(SUBDIR)pcm_tables.h -$(SUBDIR)ps.o: $(SUBDIR)ps_tables.h +$(SUBDIR)aacps.o: $(SUBDIR)aacps_tables.h $(SUBDIR)qdm2.o: $(SUBDIR)qdm2_tables.h endif |