Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vc1dec: fix a possible unitialized variable warning

Conflicts:
	libavcodec/vc1dec.c

No change as the variables where not uninitialized in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>