aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/allcodecs.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-03 12:44:17 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-10-03 13:56:52 +0200
commit4c292d5c34c9636364bcfb5f2e950c48196d9e9e (patch)
tree359af27bc9033b9a6419ea222a79d76fc8f1fad9 /libavcodec/allcodecs.c
parent5a63fb66936a2732b9d59edf3cebc4b6291f5d08 (diff)
parentf1548c008fc5d50488bb7bbc2aa4cf49d89a0bda (diff)
downloadffmpeg-4c292d5c34c9636364bcfb5f2e950c48196d9e9e.tar.gz
Merge remote-tracking branch 'rbultje/master'
* rbultje/master: Full-pixel MC functions. VP9 MC (ssse3) optimizations. Native VP9 decoder. Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/allcodecs.c')
-rw-r--r--libavcodec/allcodecs.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 12f334e340..bf58d2bcd0 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -285,6 +285,7 @@ void avcodec_register_all(void)
REGISTER_DECODER(VP6A, vp6a);
REGISTER_DECODER(VP6F, vp6f);
REGISTER_DECODER(VP8, vp8);
+ REGISTER_DECODER(VP9, vp9);
REGISTER_DECODER(VQA, vqa);
REGISTER_DECODER(WEBP, webp);
REGISTER_ENCDEC (WMV1, wmv1);