From 2aa72ecccc0610f49d3883e401202e95afc5d2a4 Mon Sep 17 00:00:00 2001
From: James Zern <jzern@google.com>
Date: Fri, 22 Oct 2010 18:09:14 +0000
Subject: Add new -slices option and use it for libvpx and libx264.

Patch by James Zern, jzern google

Originally committed as revision 25551 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/libx264.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'libavcodec/libx264.c')

diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 8387f41286..7ce04a62cc 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -294,6 +294,8 @@ static av_cold int X264_init(AVCodecContext *avctx)
 
     x4->params.b_interlaced   = avctx->flags & CODEC_FLAG_INTERLACED_DCT;
 
+    x4->params.i_slice_count  = avctx->slices;
+
     if (avctx->flags & CODEC_FLAG_GLOBAL_HEADER)
         x4->params.b_repeat_headers = 0;
 
-- 
cgit v1.2.3