Merge commit 'db8e336e5fc18c41cb4e9bab1960349e9800d546'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 17 May 2013 09:55:33 +0000 (11:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 17 May 2013 09:55:40 +0000 (11:55 +0200)
* commit 'db8e336e5fc18c41cb4e9bab1960349e9800d546':
  pthread: reindent

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/pthread.c

Simple merge