* ffmpeg-mt/master: DUPLICATE mingw32 compilation after 'unbreak avcodec_thread_init' pthread: validate_thread_parameters() ignored slice-threading being intentionally off DUPLICATE Remove unnecessary parameter from ff_thread_init() and fix behavior
Unified · Split
| @@ -877,7 +877,7 @@ static void validate_thread_parameters(AVCodecContext *avctx) · 876 unmodified lines | |||
| 877 | avctx->active_thread_type = 0; | 877 | avctx->active_thread_type = 0; |
| 878 | } else if (frame_threading_supported && (avctx->thread_type & FF_THREAD_FRAME)) { | 878 | } else if (frame_threading_supported && (avctx->thread_type & FF_THREAD_FRAME)) { |
| 879 | avctx->active_thread_type = FF_THREAD_FRAME; | 879 | avctx->active_thread_type = FF_THREAD_FRAME; |
| 880 | } else { | 880 | } else if (avctx->thread_type & FF_THREAD_SLICE) { |
| 881 | avctx->active_thread_type = FF_THREAD_SLICE; | 881 | avctx->active_thread_type = FF_THREAD_SLICE; |
| 882 | } | 882 | } |
| 883 | } | 883 | } |