Skip to content

Commit 30981a9

Browse files
committed
lavc: split snow and dirac DWTs
There is only about 4 lines of common code, so it alot cleaner when seperated. Signed-off-by: Michael Niedermayer <[email protected]>
1 parent 922332e commit 30981a9

15 files changed

+744
-660
lines changed

Diff for: libavcodec/Makefile

+3-4
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ OBJS-$(CONFIG_AANDCTTABLES) += aandcttab.o
4141
OBJS-$(CONFIG_AC3DSP) += ac3dsp.o
4242
OBJS-$(CONFIG_CRYSTALHD) += crystalhd.o
4343
OBJS-$(CONFIG_DCT) += dct.o dct32_fixed.o dct32_float.o
44-
OBJS-$(CONFIG_DWT) += dwt.o snow.o
4544
OBJS-$(CONFIG_DXVA2) += dxva2.o
4645
OBJS-$(CONFIG_ENCODERS) += faandct.o jfdctfst.o jfdctint.o
4746
OBJS-$(CONFIG_ERROR_RESILIENCE) += error_resilience.o
@@ -158,7 +157,7 @@ OBJS-$(CONFIG_DCA_DECODER) += dcadec.o dca.o dcadsp.o \
158157
dca_parser.o synth_filter.o
159158
OBJS-$(CONFIG_DCA_ENCODER) += dcaenc.o dca.o
160159
OBJS-$(CONFIG_DIRAC_DECODER) += diracdec.o dirac.o diracdsp.o \
161-
dirac_arith.o mpeg12data.o dwt.o
160+
dirac_arith.o mpeg12data.o dirac_dwt.o
162161
OBJS-$(CONFIG_DFA_DECODER) += dfa.o
163162
OBJS-$(CONFIG_DNXHD_DECODER) += dnxhddec.o dnxhddata.o
164163
OBJS-$(CONFIG_DNXHD_ENCODER) += dnxhdenc.o dnxhddata.o
@@ -396,8 +395,8 @@ OBJS-$(CONFIG_SIPR_DECODER) += sipr.o acelp_pitch_delay.o \
396395
OBJS-$(CONFIG_SMACKAUD_DECODER) += smacker.o
397396
OBJS-$(CONFIG_SMACKER_DECODER) += smacker.o
398397
OBJS-$(CONFIG_SMC_DECODER) += smc.o
399-
OBJS-$(CONFIG_SNOW_DECODER) += snowdec.o snow.o
400-
OBJS-$(CONFIG_SNOW_ENCODER) += snowenc.o snow.o \
398+
OBJS-$(CONFIG_SNOW_DECODER) += snowdec.o snow.o snow_dwt.o
399+
OBJS-$(CONFIG_SNOW_ENCODER) += snowenc.o snow.o snow_dwt.o \
401400
h263.o ituh263enc.o
402401
OBJS-$(CONFIG_SOL_DPCM_DECODER) += dpcm.o
403402
OBJS-$(CONFIG_SONIC_DECODER) += sonic.o

0 commit comments

Comments
 (0)