From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 17 Jul 2013 08:33:02 +0000 (+0200)
Subject: Merge commit '50612484e058e8b241f0528584d64d9d2ccebf12'
X-Git-Tag: n2.1~2002
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/10336ca6400a789e221027923c03400c102e50b9

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>
---

10336ca6400a789e221027923c03400c102e50b9