diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-17 11:55:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-17 11:55:40 +0200 |
| commit | 1a0057dc881c05365cbd7bfa71eeef7d5a519428 (patch) | |
| tree | 8499e70eaf62a57c5478e5c1e39e6d7e9d7048a2 /libavcodec/pthread.c | |
| parent | 36d349034e19e111cc43de7a0e5749f8235b3bf9 (diff) | |
| parent | db8e336e5fc18c41cb4e9bab1960349e9800d546 (diff) | |
| download | ffmpeg-1a0057dc881c05365cbd7bfa71eeef7d5a519428.tar.gz | |
Merge commit 'db8e336e5fc18c41cb4e9bab1960349e9800d546'
* commit 'db8e336e5fc18c41cb4e9bab1960349e9800d546':
pthread: reindent
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pthread.c')
| -rw-r--r-- | libavcodec/pthread.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index e5ffbbf1b8..f3e0f71b54 100644 --- 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; } |