diff options
| author | Guillaume Martres <smarter@ubuntu.com> | 2013-11-15 23:28:30 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-12-08 00:28:27 +0100 |
| commit | 9aa053ceded5550b2e538578af383fd89d82364c (patch) | |
| tree | 59fda0bc8eb5493846787ab47da09a3aa28926cc /libavcodec/libvpxdec.c | |
| parent | b6a971994187e87fcc8811108e144f15c1652728 (diff) | |
| download | ffmpeg-9aa053ceded5550b2e538578af383fd89d82364c.tar.gz | |
libvpx: do not mark VP9 as experimental when using libvpx >= 1.3.0
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat (limited to 'libavcodec/libvpxdec.c')
| -rw-r--r-- | libavcodec/libvpxdec.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c index d65f7f95ce..6052207b76 100644 --- a/libavcodec/libvpxdec.c +++ b/libavcodec/libvpxdec.c @@ -31,6 +31,7 @@ #include "libavutil/imgutils.h" #include "avcodec.h" #include "internal.h" +#include "libvpx.h" typedef struct VP8DecoderContext { struct vpx_codec_ctx decoder; @@ -132,6 +133,9 @@ 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); } @@ -144,6 +148,6 @@ AVCodec ff_libvpx_vp9_decoder = { .init = vp9_init, .close = vp8_free, .decode = vp8_decode, - .capabilities = CODEC_CAP_AUTO_THREADS | CODEC_CAP_EXPERIMENTAL, + .capabilities = CODEC_CAP_AUTO_THREADS, }; #endif /* CONFIG_LIBVPX_VP9_DECODER */ |