diff options
author | Alex Converse <alex.converse@gmail.com> | 2010-06-22 23:29:03 +0400 |
---|---|---|
committer | Alex Converse <alex.converse@gmail.com> | 2010-06-22 23:29:03 +0400 |
commit | fd6eb4a06c31e518060e27a818b8acf4410be94a (patch) | |
tree | 04033adc5b3df5d7b221b79aaca330187732becf /libavcodec | |
parent | 3b636f21daa6996e20ef97131a1c3649c3043304 (diff) |
Move Parametric Stereo related ps* files to aacps*.
Originally committed as revision 23720 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/Makefile | 4 | ||||
-rw-r--r-- | libavcodec/aacps.c (renamed from libavcodec/ps.c) | 6 | ||||
-rw-r--r-- | libavcodec/aacps.h (renamed from libavcodec/ps.h) | 0 | ||||
-rw-r--r-- | libavcodec/aacps_tablegen.c (renamed from libavcodec/ps_tablegen.c) | 2 | ||||
-rw-r--r-- | libavcodec/aacps_tablegen.h (renamed from libavcodec/ps_tablegen.h) | 8 | ||||
-rw-r--r-- | libavcodec/aacpsdata.c (renamed from libavcodec/psdata.c) | 0 | ||||
-rw-r--r-- | libavcodec/aacsbr.c | 2 | ||||
-rw-r--r-- | libavcodec/sbr.h | 2 |
8 files changed, 12 insertions, 12 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 diff --git a/libavcodec/ps.c b/libavcodec/aacps.c index 3487a6438f..fc124d1972 100644 --- a/libavcodec/ps.c +++ b/libavcodec/aacps.c @@ -24,9 +24,9 @@ #include "libavutil/mathematics.h" #include "avcodec.h" #include "get_bits.h" -#include "ps.h" -#include "ps_tablegen.h" -#include "psdata.c" +#include "aacps.h" +#include "aacps_tablegen.h" +#include "aacpsdata.c" #define PS_BASELINE 0 //< Operate in Baseline PS mode //< Baseline implies 10 or 20 stereo bands, diff --git a/libavcodec/ps.h b/libavcodec/aacps.h index 61fbf53153..61fbf53153 100644 --- a/libavcodec/ps.h +++ b/libavcodec/aacps.h diff --git a/libavcodec/ps_tablegen.c b/libavcodec/aacps_tablegen.c index d2835cbde9..dc7797f6b8 100644 --- a/libavcodec/ps_tablegen.c +++ b/libavcodec/aacps_tablegen.c @@ -22,7 +22,7 @@ #include <stdlib.h> #define CONFIG_HARDCODED_TABLES 0 -#include "ps_tablegen.h" +#include "aacps_tablegen.h" #include "tableprint.h" void write_float_3d_array (const void *p, int b, int c, int d) diff --git a/libavcodec/ps_tablegen.h b/libavcodec/aacps_tablegen.h index 1d42377d54..3c1b27decd 100644 --- a/libavcodec/ps_tablegen.h +++ b/libavcodec/aacps_tablegen.h @@ -20,14 +20,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef PS_TABLEGEN_H -#define PS_TABLEGEN_H +#ifndef AACPS_TABLEGEN_H +#define AACPS_TABLEGEN_H #include <stdint.h> #if CONFIG_HARDCODED_TABLES #define ps_tableinit() -#include "libavcodec/ps_tables.h" +#include "libavcodec/aacps_tables.h" #else #include "../libavutil/common.h" #include "../libavutil/mathematics.h" @@ -209,4 +209,4 @@ static void ps_tableinit(void) } #endif /* CONFIG_HARDCODED_TABLES */ -#endif /* PS_TABLEGEN_H */ +#endif /* AACPS_TABLEGEN_H */ diff --git a/libavcodec/psdata.c b/libavcodec/aacpsdata.c index 7431caebc6..7431caebc6 100644 --- a/libavcodec/psdata.c +++ b/libavcodec/aacpsdata.c diff --git a/libavcodec/aacsbr.c b/libavcodec/aacsbr.c index b0bf219293..ca5c52cce3 100644 --- a/libavcodec/aacsbr.c +++ b/libavcodec/aacsbr.c @@ -31,7 +31,7 @@ #include "aacsbr.h" #include "aacsbrdata.h" #include "fft.h" -#include "ps.h" +#include "aacps.h" #include <stdint.h> #include <float.h> diff --git a/libavcodec/sbr.h b/libavcodec/sbr.h index adf799a7e6..1c87a2e564 100644 --- a/libavcodec/sbr.h +++ b/libavcodec/sbr.h @@ -31,7 +31,7 @@ #include <stdint.h> #include "fft.h" -#include "ps.h" +#include "aacps.h" /** * Spectral Band Replication header - spectrum parameters that invoke a reset if they differ from the previous header. |