[FFmpeg-cvslog] libvpxenc: token_parts is VP8 specific
James Almer
git at videolan.org
Sun Dec 8 00:45:13 CET 2013
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Dec 7 16:33:58 2013 -0300| [ae330070ee8b985abb011835502b03baacfbb18c] | committer: Michael Niedermayer
libvpxenc: token_parts is VP8 specific
Signed-off-by: James Almer <jamrial at gmail.com>
Reviewed-by: James Zern <jzern at google.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ae330070ee8b985abb011835502b03baacfbb18c
---
libavcodec/libvpxenc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
index 85d1fba..65586cf 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)
More information about the ffmpeg-cvslog
mailing list