Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Oct 2011 00:29:40 +0000 (02:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Oct 2011 00:29:40 +0000 (02:29 +0200)
commit266172aaf968bb71713490cdc64ae4929ad08b8b
tree0f67e7bc87198468c684554bd392abc026f3d79e
parentf524b1184e94cf1ffff15f4f393172a73bb4b7f6
parent27237d524e56210992b18486924894bb4f3fdbb8
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>
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/h264_direct.c
libavcodec/mpeg12.c
libavcodec/mpegvideo.c
libavcodec/pthread.c
libavcodec/utils.c
libavcodec/vp3.c