diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-15 14:57:57 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-15 14:57:57 +0100 |
commit | 353dbaa29714c9fb7d4b3ccc7e1b50569b0ea257 (patch) | |
tree | e0e67a898b5e6ce2ba9d641473960beb109995ff /libavcodec/Makefile | |
parent | 8686b6c68bacfdd9ffa89736756192188973ad5d (diff) | |
parent | 3f111804eb5c603a344706b84b7164cbf7b4e0df (diff) | |
download | ffmpeg-streaming-353dbaa29714c9fb7d4b3ccc7e1b50569b0ea257.zip ffmpeg-streaming-353dbaa29714c9fb7d4b3ccc7e1b50569b0ea257.tar.gz |
Merge commit '3f111804eb5c603a344706b84b7164cbf7b4e0df'
* commit '3f111804eb5c603a344706b84b7164cbf7b4e0df':
libvpx: make vp8 and vp9 selectable
libvpx: support vp9
nut: support vp9 tag
mkv: support vp9 tag
rtpdec: Make variables that should wrap unsigned
Conflicts:
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
-rw-r--r-- | libavcodec/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 06d426b..daff3c1 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -702,8 +702,10 @@ OBJS-$(CONFIG_LIBVO_AMRWBENC_ENCODER) += libvo-amrwbenc.o OBJS-$(CONFIG_LIBVORBIS_DECODER) += libvorbisdec.o OBJS-$(CONFIG_LIBVORBIS_ENCODER) += libvorbisenc.o audio_frame_queue.o \ vorbis_data.o vorbis_parser.o xiph.o -OBJS-$(CONFIG_LIBVPX_DECODER) += libvpxdec.o -OBJS-$(CONFIG_LIBVPX_ENCODER) += libvpxenc.o +OBJS-$(CONFIG_LIBVPX_VP8_DECODER) += libvpxdec.o +OBJS-$(CONFIG_LIBVPX_VP8_ENCODER) += libvpxenc.o +OBJS-$(CONFIG_LIBVPX_VP9_DECODER) += libvpxdec.o +OBJS-$(CONFIG_LIBVPX_VP9_ENCODER) += libvpxenc.o OBJS-$(CONFIG_LIBX264_ENCODER) += libx264.o OBJS-$(CONFIG_LIBXAVS_ENCODER) += libxavs.o OBJS-$(CONFIG_LIBXVID_ENCODER) += libxvid.o |