Merge commit '5cd6513f5be14b9744783d3d9e853d3f11065e93'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 08:54:42 +0000 (09:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 08:55:24 +0000 (09:55 +0100)
commit3d4dc43259e2f58e7f55f2152094a1ee4333bfd2
treeb586dcddc66156282747029a6c3f4476d31976a1
parentf3758e8b804089468ad7a7c4aea8f0956f7ea880
parent5cd6513f5be14b9744783d3d9e853d3f11065e93
Merge commit '5cd6513f5be14b9744783d3d9e853d3f11065e93'

* commit '5cd6513f5be14b9744783d3d9e853d3f11065e93':
  pthread: drop avcodec_ prefixes from static functions

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