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)
* commit '5cd6513f5be14b9744783d3d9e853d3f11065e93':
  pthread: drop avcodec_ prefixes from static functions

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

Simple merge