diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 22:21:03 +0300 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 22:21:03 +0300 |
commit | e56f14659f580954626e8c1660771c593ecd74fa (patch) | |
tree | c2c0eeb1f93092778165d4812316df3df2d65ff8 /libavcodec/Makefile | |
parent | 4c7c0d37e5c2ad5b046d1f543e47850c8b94403d (diff) | |
parent | e1319aa1c1be9b64117c19170344fb78841dd67c (diff) |
Merge commit 'e1319aa1c1be9b64117c19170344fb78841dd67c'
* commit 'e1319aa1c1be9b64117c19170344fb78841dd67c':
libx264: Add support for the MPEG2 encoder
Conflicts:
configure
libavcodec/Makefile
libavcodec/libx264.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
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 b7fe1c9270..204e54fe6e 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -804,6 +804,7 @@ OBJS-$(CONFIG_LIBVPX_VP9_ENCODER) += libvpxenc.o libvpx.o OBJS-$(CONFIG_LIBWAVPACK_ENCODER) += libwavpackenc.o OBJS-$(CONFIG_LIBWEBP_ENCODER) += libwebpenc_common.o libwebpenc.o OBJS-$(CONFIG_LIBWEBP_ANIM_ENCODER) += libwebpenc_common.o libwebpenc_animencoder.o +OBJS-$(CONFIG_LIBX262_ENCODER) += libx264.o OBJS-$(CONFIG_LIBX264_ENCODER) += libx264.o OBJS-$(CONFIG_LIBX265_ENCODER) += libx265.o OBJS-$(CONFIG_LIBXAVS_ENCODER) += libxavs.o |