Michael Niedermayer 266172aaf9 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@gmx.at>

2011-10-17 02:29:40 +02:00

26 KiB

Raw Blame History

View Raw