Merge commit 'db8e336e5fc18c41cb4e9bab1960349e9800d546'

* commit 'db8e336e5fc18c41cb4e9bab1960349e9800d546': pthread: reindent Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago · 1a0057dc88
parent 36d349034e db8e336e5f
commit 1a0057dc88
1 changed files with 5 additions and 5 deletions
--- a/libavcodec/pthread.c
+++ b/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;
 }