On 2012-01-01 17:14:31 +0100, Janne Grunau  wrote:
> Module: libav
> Branch: master
> Commit: b6064d9a5970c3aed9284a272bdb288e3eb00990
> 
> Author:    Janne Grunau <[email protected]>
> Committer: Janne Grunau <[email protected]>
> Date:      Sun Jan  1 14:17:32 2012 +0100
> 
> threads: set thread_count to 1 when thread support is disabled
> 
> ---
> 
>  libavcodec/utils.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/libavcodec/utils.c b/libavcodec/utils.c
> index a88d1a7..c845a31 100644
> --- a/libavcodec/utils.c
> +++ b/libavcodec/utils.c
> @@ -710,6 +710,8 @@ int attribute_align_arg avcodec_open2(AVCodecContext 
> *avctx, AVCodec *codec, AVD
>              goto free_and_end;
>          }
>      }
> +    if (!HAVE_THREADS && !(codec->capabilities & CODEC_CAP_AUTO_THREADS))
> +        avctx->thread_count = 1;

this broke the threaded vsynth fate tests on configs with disabled
thread support. compare:

http://fate.libav.org/parisc-linux-gcc-4.3/20120101002309
http://fate.libav.org/parisc-linux-gcc-4.3/20120102002106

the mpeg encoder misuses thread_count as slice count and ignores
avctx->slices. I'll fix that.

Janne

_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to