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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Dec 22 21:39:10 2013 +0100| [c19f193c6b239782b10bd9df117da2e50468edf9] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vc1: Fix intensity compensation performance regression

Conflicts:
	libavcodec/vc1.c

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

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