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)
commit1a0057dc881c05365cbd7bfa71eeef7d5a519428
tree8499e70eaf62a57c5478e5c1e39e6d7e9d7048a2
parent36d349034e19e111cc43de7a0e5749f8235b3bf9
parentdb8e336e5fc18c41cb4e9bab1960349e9800d546
Merge commit 'db8e336e5fc18c41cb4e9bab1960349e9800d546'

* commit 'db8e336e5fc18c41cb4e9bab1960349e9800d546':
  pthread: reindent

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