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/libvpxenc.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/libvpxenc.c')
| -rw-r--r-- | libavcodec/libvpxenc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index c7ca050b17..869c8fe115 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -852,9 +852,6 @@ AVCodec ff_libvpx_vp8_encoder = { #if CONFIG_LIBVPX_VP9_ENCODER 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_cx_algo); } @@ -878,5 +875,6 @@ AVCodec ff_libvpx_vp9_encoder = { .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, .priv_class = &class_vp9, .defaults = defaults, + .init_static_data = ff_vp9_init_static, }; #endif /* CONFIG_LIBVPX_VP9_ENCODER */ |