diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-08 13:49:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-08 13:49:16 +0100 |
| commit | eb87d1f6784fb488b95fb0932c0367e8d9d0418d (patch) | |
| tree | 0db5e72271bf5d627d4da9f3de5293b54e85d038 /libavcodec/libvpxdec.c | |
| parent | ae330070ee8b985abb011835502b03baacfbb18c (diff) | |
| parent | 9aa053ceded5550b2e538578af383fd89d82364c (diff) | |
| download | ffmpeg-eb87d1f6784fb488b95fb0932c0367e8d9d0418d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libvpx: do not mark VP9 as experimental when using libvpx >= 1.3.0
Conflicts:
libavcodec/libvpxdec.c
libavcodec/libvpxenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 b2471c722b..8d608c3860 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_DR1 | CODEC_CAP_EXPERIMENTAL, + .capabilities = CODEC_CAP_AUTO_THREADS | CODEC_CAP_DR1, }; #endif /* CONFIG_LIBVPX_VP9_DECODER */ |