On Tue, May 17, 2011 at 10:26:29AM -0400, Ronald S. Bultje wrote:
> Fixes "make THREADS=2 THREAD_TYPE=1 fate-mpeg2-field-enc".
> ---
> libavcodec/mpeg12.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
> index ffe6b94..3cc1f60 100644
> --- a/libavcodec/mpeg12.c
> +++ b/libavcodec/mpeg12.c
> @@ -2262,7 +2262,7 @@ static int decode_chunks(AVCodecContext *avctx,
> buf_ptr = ff_find_start_code(buf_ptr,buf_end, &start_code);
> if (start_code > 0x1ff){
> if(s2->pict_type != AV_PICTURE_TYPE_B || avctx->skip_frame <=
> AVDISCARD_DEFAULT){
> - if(avctx->thread_count > 1){
> + if(avctx->active_thread_type & FF_THREAD_SLICE &&
> avctx->thread_count > 1){
probably ok but please add parentheses for readability (it's too easy to
confuse & and && here)
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
