diff options
| author | Martin Storsjo <martin@martin.st> | 2012-06-28 15:21:01 +0300 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2012-07-11 14:28:03 +0300 |
| commit | 28ca63087f40ca3f1e8e75ccf48096058882ad9d (patch) | |
| tree | 50e4f6897282802277d08f76968ffcfb2c2f8d8d | |
| parent | ce9492073b354a3c1e4282c378cff8518bdf8318 (diff) | |
| download | fdk-aac-dabplus-28ca63087f40ca3f1e8e75ccf48096058882ad9d.tar.gz fdk-aac-dabplus-28ca63087f40ca3f1e8e75ccf48096058882ad9d.tar.bz2 fdk-aac-dabplus-28ca63087f40ca3f1e8e75ccf48096058882ad9d.zip | |
Add an _enc suffix to the sbr_ram/rom files in libSBRenc
This avoids name clashes with the similarly named files in
libSBRdec, when building all libraries with one single
automake file.
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | libSBRenc/src/sbr_ram_enc.cpp (renamed from libSBRenc/src/sbr_ram.cpp) | 0 | ||||
| -rw-r--r-- | libSBRenc/src/sbr_rom_enc.cpp (renamed from libSBRenc/src/sbr_rom.cpp) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 2ceb22d..c5b320f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -152,7 +152,7 @@ SBRENC_SRC = \ $(SBRENC_DIR)/ps_encode.cpp \ $(SBRENC_DIR)/resampler.cpp \ $(SBRENC_DIR)/sbr_encoder.cpp \ - $(SBRENC_DIR)/sbr_ram.cpp \ + $(SBRENC_DIR)/sbr_ram_enc.cpp \ $(SBRENC_DIR)/ton_corr.cpp \ $(SBRENC_DIR)/code_env.cpp \ $(SBRENC_DIR)/env_est.cpp \ @@ -161,7 +161,7 @@ SBRENC_SRC = \ $(SBRENC_DIR)/ps_main.cpp \ $(SBRENC_DIR)/sbrenc_freq_sca.cpp \ $(SBRENC_DIR)/sbr_misc.cpp \ - $(SBRENC_DIR)/sbr_rom.cpp \ + $(SBRENC_DIR)/sbr_rom_enc.cpp \ $(SBRENC_DIR)/tran_det.cpp SYS_DIR = $(top_srcdir)/libSYS/src diff --git a/libSBRenc/src/sbr_ram.cpp b/libSBRenc/src/sbr_ram_enc.cpp index e304c39..e304c39 100644 --- a/libSBRenc/src/sbr_ram.cpp +++ b/libSBRenc/src/sbr_ram_enc.cpp diff --git a/libSBRenc/src/sbr_rom.cpp b/libSBRenc/src/sbr_rom_enc.cpp index 6fd51a2..6fd51a2 100644 --- a/libSBRenc/src/sbr_rom.cpp +++ b/libSBRenc/src/sbr_rom_enc.cpp |