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/allcodecs.c | |
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/allcodecs.c')
-rw-r--r-- | libavcodec/allcodecs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 9d228b7..974a937 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -488,7 +488,8 @@ void avcodec_register_all(void) REGISTER_ENCODER(LIBVO_AACENC, libvo_aacenc); REGISTER_ENCODER(LIBVO_AMRWBENC, libvo_amrwbenc); REGISTER_ENCDEC (LIBVORBIS, libvorbis); - REGISTER_ENCDEC (LIBVPX, libvpx); + REGISTER_ENCDEC (LIBVPX_VP8, libvpx_vp8); + REGISTER_ENCDEC (LIBVPX_VP9, libvpx_vp9); REGISTER_ENCODER(LIBX264, libx264); REGISTER_ENCODER(LIBX264RGB, libx264rgb); REGISTER_ENCODER(LIBXAVS, libxavs); |