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/libvpx.c | |
| parent | 0e575c24d62a3d9f51bca04d22c234e3857b86a9 (diff) | |
| download | ffmpeg-streaming-8e5a2989a387e809d7367167114d2f2a45649ffa.zip ffmpeg-streaming-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/libvpx.c')
| -rw-r--r-- | libavcodec/libvpx.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/libavcodec/libvpx.c b/libavcodec/libvpx.c index 9ff2e91..5d29893 100644 --- a/libavcodec/libvpx.c +++ b/libavcodec/libvpx.c @@ -22,14 +22,9 @@ #include "libvpx.h" -int ff_vp9_check_experimental(AVCodecContext *avctx) +av_cold void ff_vp9_init_static(AVCodec *codec) { - if (avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL && - (vpx_codec_version_major() < 1 || - (vpx_codec_version_major() == 1 && vpx_codec_version_minor() < 3))) { - av_log(avctx, AV_LOG_ERROR, - "Non-experimental support of VP9 requires libvpx >= 1.3.0\n"); - return AVERROR_EXPERIMENTAL; - } - return 0; + if ( vpx_codec_version_major() < 1 + || (vpx_codec_version_major() == 1 && vpx_codec_version_minor() < 3)) + codec->capabilities |= CODEC_CAP_EXPERIMENTAL; } |
