diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-03 12:42:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-03 12:47:26 +0200 |
| commit | e5cdf9c03b1ef0913dad117b0e5d343a525f6d10 (patch) | |
| tree | 82a2beb4104fa6f9c5d8d6a862b4165be227072c /libavcodec/Makefile | |
| parent | 5c43f3ddea40fc76264d647750f6986a9247aead (diff) | |
| parent | 2d66a58ccde05e764594bd7e5f0f9244634d0b2c (diff) | |
Merge commit '2d66a58ccde05e764594bd7e5f0f9244634d0b2c'
* commit '2d66a58ccde05e764594bd7e5f0f9244634d0b2c':
Go2Webinar decoder
Conflicts:
Changelog
configure
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index d935a1009e..1aeea281e5 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -208,6 +208,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 mjpeg.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 |