Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Aug 2014 16:48:03 +0000 (18:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Aug 2014 16:48:07 +0000 (18:48 +0200)
* cehoyos/master:
  lavf/img2dec: Initialize a stack variable.

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

Trivial merge