From: James Almer <jamrial@gmail.com>
Date: Sat, 7 Dec 2013 19:33:58 +0000 (-0300)
Subject: libvpxenc: token_parts is VP8 specific
X-Git-Tag: android-x86-6.0-r1~8468
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ae330070ee8b985abb011835502b03baacfbb18c;p=android-x86%2Fexternal-ffmpeg.git

libvpxenc: token_parts is VP8 specific

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---

diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
index 85d1fba6b9..65586cf02a 100644
--- a/libavcodec/libvpxenc.c
+++ b/libavcodec/libvpxenc.c
@@ -427,7 +427,8 @@ static av_cold int vpx_init(AVCodecContext *avctx,
     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 (avctx->codec_id == AV_CODEC_ID_VP8)
+        codecctl_int(avctx, VP8E_SET_TOKEN_PARTITIONS,  av_log2(avctx->slices));
     codecctl_int(avctx, VP8E_SET_STATIC_THRESHOLD,  avctx->mb_threshold);
     codecctl_int(avctx, VP8E_SET_CQ_LEVEL,          ctx->crf);
     if (ctx->max_intra_rate >= 0)