diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2015-06-16 03:48:00 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2015-06-20 12:18:01 +0300 |
| commit | 05bf3f54e6078716f6267df530bf1d474ca3d606 (patch) | |
| tree | d0f0a250b889f330d94464fe986b4f569fc8667b | |
| parent | c060d046aa2f89c0e601a2dcfbce53f0e36cf498 (diff) | |
| download | ffmpeg-05bf3f54e6078716f6267df530bf1d474ca3d606.tar.gz | |
libvpx: Do not set vp8 only parameters when encoding in vp9
| -rw-r--r-- | libavcodec/libvpxenc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 4164769ad6..0f4bd61239 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -346,8 +346,11 @@ static av_cold int vpx_init(AVCodecContext *avctx, codecctl_int(avctx, VP8E_SET_ARNR_STRENGTH, ctx->arnr_strength); if (ctx->arnr_type >= 0) codecctl_int(avctx, VP8E_SET_ARNR_TYPE, ctx->arnr_type); - codecctl_int(avctx, VP8E_SET_NOISE_SENSITIVITY, avctx->noise_reduction); - codecctl_int(avctx, VP8E_SET_TOKEN_PARTITIONS, av_log2(avctx->slices)); + + if (CONFIG_LIBVPX_VP8_ENCODER && iface == &vpx_codec_vp8_cx_algo) { + codecctl_int(avctx, VP8E_SET_NOISE_SENSITIVITY, avctx->noise_reduction); + codecctl_int(avctx, VP8E_SET_TOKEN_PARTITIONS, av_log2(avctx->slices)); + } #if FF_API_MPV_OPT FF_DISABLE_DEPRECATION_WARNINGS if (avctx->mb_threshold) { |