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/libvpxenc.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/libvpxenc.c')
| -rw-r--r-- | libavcodec/libvpxenc.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 9996afc74c..ce8ea33149 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -30,6 +30,7 @@ #include "avcodec.h" #include "internal.h" +#include "libvpx.h" #include "libavutil/base64.h" #include "libavutil/common.h" #include "libavutil/mathematics.h" @@ -605,6 +606,9 @@ 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); } @@ -624,7 +628,7 @@ AVCodec ff_libvpx_vp9_encoder = { .init = vp9_init, .encode2 = vp8_encode, .close = vp8_free, - .capabilities = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS | CODEC_CAP_EXPERIMENTAL, + .capabilities = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, .priv_class = &class_vp9, .defaults = defaults, |