Commit 1a0057dc authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'db8e336e'

* commit 'db8e336e':
  pthread: reindent
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 36d34903 db8e336e
......@@ -1150,12 +1150,12 @@ int ff_thread_init(AVCodecContext *avctx)
w32thread_init();
#endif
validate_thread_parameters(avctx);
validate_thread_parameters(avctx);
if (avctx->active_thread_type&FF_THREAD_SLICE)
return thread_init(avctx);
else if (avctx->active_thread_type&FF_THREAD_FRAME)
return frame_thread_init(avctx);
if (avctx->active_thread_type&FF_THREAD_SLICE)
return thread_init(avctx);
else if (avctx->active_thread_type&FF_THREAD_FRAME)
return frame_thread_init(avctx);
return 0;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment