[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 17 02:29:40 2011 +0200| [266172aaf968bb71713490cdc64ae4929ad08b8b] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  w32threads: support for frame multithreading
  avcodec: remove stray @deprecated comment

Conflicts:
	libavcodec/utils.c
	libavcodec/w32thread.c

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

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