Merge commit 'd5d2d6c3b8cff61eb26c18bbd977881cf6d5524a'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 13:11:46 +0000 (14:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 13:21:18 +0000 (14:21 +0100)
* commit 'd5d2d6c3b8cff61eb26c18bbd977881cf6d5524a':
  dcadec: initialize variables before use

Conflicts:
libavcodec/dcadec.c

See: 53918a1c54b49e76c3ca517e2caada8372995712
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/dcadec.c

Simple merge