Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 2 Apr 2014 01:25:29 +0000 (03:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 2 Apr 2014 01:25:29 +0000 (03:25 +0200)
* 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>

Trivial merge