diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-16 01:45:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-16 01:46:35 +0100 |
| commit | 47df21e1727c83648a645b0dde34e99f1b7bdc93 (patch) | |
| tree | ed098a84b05dde35955ca00471464be09a6eba78 /libavcodec/Makefile | |
| parent | 38e641a060e0c00930851a8053ca96250b3ecccc (diff) | |
| parent | 67690683130faf37dd9d969ced15eba2a1940ade (diff) | |
Merge commit '67690683130faf37dd9d969ced15eba2a1940ade'
* commit '67690683130faf37dd9d969ced15eba2a1940ade':
g722: Split out g722_qmf_apply() function into g722dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 2aa5120b81..8dacbc114a 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -619,8 +619,8 @@ OBJS-$(CONFIG_ADPCM_EA_R1_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_EA_R2_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_EA_R3_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_EA_XAS_DECODER) += adpcm.o adpcm_data.o -OBJS-$(CONFIG_ADPCM_G722_DECODER) += g722.o g722dec.o -OBJS-$(CONFIG_ADPCM_G722_ENCODER) += g722.o g722enc.o +OBJS-$(CONFIG_ADPCM_G722_DECODER) += g722.o g722dsp.o g722dec.o +OBJS-$(CONFIG_ADPCM_G722_ENCODER) += g722.o g722dsp.o g722enc.o OBJS-$(CONFIG_ADPCM_G726_DECODER) += g726.o OBJS-$(CONFIG_ADPCM_G726_ENCODER) += g726.o OBJS-$(CONFIG_ADPCM_G726LE_DECODER) += g726.o |