Merge commit '50612484e058e8b241f0528584d64d9d2ccebf12'

* commit '50612484e058e8b241f0528584d64d9d2ccebf12':
  pthread: Rename thread_init to avoid symbol collision

Conflicts:
	libavcodec/pthread.c
	libavfilter/pthread.c

See: 674d8a9629609a17fd6916164556cb012d6e6a1c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/pthread.c
Simple merge

diff --cc libavfilter/pthread.c
Simple merge