Merge commit 'db8e336e'

* commit 'db8e336e':
  pthread: reindent
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

libavcodec/pthread.c

@@ -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;
 }