diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-01 03:18:30 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-01 03:18:30 +0200 |
commit | 68939f7682de3e87251c6e08470d5779804ddd6d (patch) | |
tree | 6eba76563947a5802befcf9effc39ee7638343ba /libavcodec/Makefile | |
parent | 3974889614e04f700637b564df737c180d8583ea (diff) | |
parent | 08c2d8f0aa679c2f060721d1d0d4f33d2ae32368 (diff) |
Merge commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368'
* commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368':
Go2Meeting decoder
Conflicts:
Changelog
libavcodec/g2meet.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
-rw-r--r-- | libavcodec/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index bcb9217121..db8d818137 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -257,7 +257,7 @@ OBJS-$(CONFIG_FLIC_DECODER) += flicvideo.o OBJS-$(CONFIG_FOURXM_DECODER) += 4xm.o OBJS-$(CONFIG_FRAPS_DECODER) += fraps.o OBJS-$(CONFIG_FRWU_DECODER) += frwu.o -OBJS-$(CONFIG_G2M_DECODER) += g2meet.o +OBJS-$(CONFIG_G2M_DECODER) += g2meet.o elsdec.o OBJS-$(CONFIG_G723_1_DECODER) += g723_1.o acelp_vectors.o \ celp_filters.o celp_math.o OBJS-$(CONFIG_G723_1_ENCODER) += g723_1.o acelp_vectors.o celp_math.o |