[FFmpeg-cvslog] doc/encoders: Fix libkvazaar documentation

[Arttu Ylä-Outinen]

ffmpeg | branch: master | Arttu Ylä-Outinen <arttu.yla-outinen at tut.fi> | Mon Sep 28 11:30:06 2015 +0300| [cb8999f368bb40c666f51742686c00a9357d436c] | committer: Arttu Ylä-Outinen

doc/encoders: Fix libkvazaar documentation

The -threads option is ignored with libkvazaar since it does not have
any of the AV_CODEC_CAP_{FRAME,SLICE,AUTO}_THREADS capabilities. This
commit removes the incorrect documentation as well as the no-op of
setting the number of threads in libkvazaar encoder.

Signed-off-by: Arttu Ylä-Outinen <arttu.yla-outinen at tut.fi>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cb8999f368bb40c666f51742686c00a9357d436c
---

 doc/encoders.texi       |    3 ---
 libavcodec/libkvazaar.c |    1 -
 2 files changed, 4 deletions(-)

diff --git a/doc/encoders.texi b/doc/encoders.texi
index f2d46dc..d7023bf 100644
--- a/doc/encoders.texi
+++ b/doc/encoders.texi
@@ -2401,9 +2401,6 @@ configuration. You need to explicitly configure the build with
 @item b
 Set target video bitrate in bit/s and enable rate control.
 
- at item threads
-Set number of encoding threads.
-
 @item kvazaar-params
 Set kvazaar parameters as a list of @var{name}=@var{value} pairs separated
 by commas (,). See kvazaar documentation for a list of options.
diff --git a/libavcodec/libkvazaar.c b/libavcodec/libkvazaar.c
index 0cf890f..3000f6a 100644
--- a/libavcodec/libkvazaar.c
+++ b/libavcodec/libkvazaar.c
@@ -74,7 +74,6 @@ static av_cold int libkvazaar_init(AVCodecContext *avctx)
     cfg->height = avctx->height;
     cfg->framerate =
       avctx->time_base.den / (double)(avctx->time_base.num * avctx->ticks_per_frame);
-    cfg->threads = avctx->thread_count;
     cfg->target_bitrate = avctx->bit_rate;
     cfg->vui.sar_width = avctx->sample_aspect_ratio.num;
     cfg->vui.sar_height = avctx->sample_aspect_ratio.den;