diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-08 14:04:06 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-10 04:02:10 +0100 |
commit | 8e5a2989a387e809d7367167114d2f2a45649ffa (patch) | |
tree | 62cef06648754c737bf2413e36d3e51b1c80d713 /libavcodec/libvpxdec.c | |
parent | 0e575c24d62a3d9f51bca04d22c234e3857b86a9 (diff) | |
download | ffmpeg-8e5a2989a387e809d7367167114d2f2a45649ffa.tar.gz |
avcodec/libvpx: set CODEC_CAP_EXPERIMENTAL correctly instead of testing at codec open time
Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libvpxdec.c')
-rw-r--r-- | libavcodec/libvpxdec.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c index 8d608c3860..94e1e4d1ef 100644 --- a/libavcodec/libvpxdec.c +++ b/libavcodec/libvpxdec.c @@ -133,9 +133,6 @@ AVCodec ff_libvpx_vp8_decoder = { #if CONFIG_LIBVPX_VP9_DECODER static av_cold int vp9_init(AVCodecContext *avctx) { - int ret; - if ((ret = ff_vp9_check_experimental(avctx))) - return ret; return vpx_init(avctx, &vpx_codec_vp9_dx_algo); } @@ -149,5 +146,6 @@ AVCodec ff_libvpx_vp9_decoder = { .close = vp8_free, .decode = vp8_decode, .capabilities = CODEC_CAP_AUTO_THREADS | CODEC_CAP_DR1, + .init_static_data = ff_vp9_init_static, }; #endif /* CONFIG_LIBVPX_VP9_DECODER */ |