[FFmpeg-cvslog] Merge commit '30e256430eb88c6d4c382581b89bca171d79fbc0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 17 11:49:00 2013 +0200| [36d349034e19e111cc43de7a0e5749f8235b3bf9] | committer: Michael Niedermayer

Merge commit '30e256430eb88c6d4c382581b89bca171d79fbc0'

* commit '30e256430eb88c6d4c382581b89bca171d79fbc0':
  lavc/pthread: remove obsolete checks

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=36d349034e19e111cc43de7a0e5749f8235b3bf9
---