diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-18 22:27:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-18 22:28:34 +0200 |
| commit | 4b0fa45b842cb1a6721f4e83edd09400c35162fd (patch) | |
| tree | d23c8f30dc9db2e52d5b90a28995d60150071f99 /libavcodec/Makefile | |
| parent | 521f5697348d96ac7c725bc2cba14d6ce4944334 (diff) | |
| parent | b4edbe9a0eb48423fbf249b0ca7fb62838bdb7f5 (diff) | |
Merge commit 'b4edbe9a0eb48423fbf249b0ca7fb62838bdb7f5'
* commit 'b4edbe9a0eb48423fbf249b0ca7fb62838bdb7f5':
libgsm: Split decoder and encoder
Conflicts:
libavcodec/libgsmenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 307ad22a1b..634cebcde0 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -716,10 +716,10 @@ OBJS-$(CONFIG_LIBCELT_DECODER) += libcelt_dec.o OBJS-$(CONFIG_LIBFAAC_ENCODER) += libfaac.o OBJS-$(CONFIG_LIBFDK_AAC_DECODER) += libfdk-aacdec.o OBJS-$(CONFIG_LIBFDK_AAC_ENCODER) += libfdk-aacenc.o -OBJS-$(CONFIG_LIBGSM_DECODER) += libgsm.o -OBJS-$(CONFIG_LIBGSM_ENCODER) += libgsm.o -OBJS-$(CONFIG_LIBGSM_MS_DECODER) += libgsm.o -OBJS-$(CONFIG_LIBGSM_MS_ENCODER) += libgsm.o +OBJS-$(CONFIG_LIBGSM_DECODER) += libgsmdec.o +OBJS-$(CONFIG_LIBGSM_ENCODER) += libgsmenc.o +OBJS-$(CONFIG_LIBGSM_MS_DECODER) += libgsmdec.o +OBJS-$(CONFIG_LIBGSM_MS_ENCODER) += libgsmenc.o OBJS-$(CONFIG_LIBILBC_DECODER) += libilbc.o OBJS-$(CONFIG_LIBILBC_ENCODER) += libilbc.o OBJS-$(CONFIG_LIBMP3LAME_ENCODER) += libmp3lame.o mpegaudiodecheader.o |