diff options
| author | Arttu Ylä-Outinen <arttu.yla-outinen@tut.fi> | 2015-09-28 11:30:06 +0300 |
|---|---|---|
| committer | Arttu Ylä-Outinen <arttu.yla-outinen@tut.fi> | 2015-10-07 17:09:13 +0300 |
| commit | cb8999f368bb40c666f51742686c00a9357d436c (patch) | |
| tree | 79f7fd68f30650ed77573d45ee029ba207f79a29 | |
| parent | 0e348683875d7915d699488fd6c29fb9ffd48453 (diff) | |
| download | ffmpeg-cb8999f368bb40c666f51742686c00a9357d436c.tar.gz | |
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@tut.fi>
| -rw-r--r-- | doc/encoders.texi | 3 | ||||
| -rw-r--r-- | libavcodec/libkvazaar.c | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/doc/encoders.texi b/doc/encoders.texi index f2d46dc6dd..d7023bf6b6 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. -@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 0cf890f229..3000f6ac6e 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; |