[FFmpeg-cvslog] Merge commit 'd5d2d6c3b8cff61eb26c18bbd977881cf6d5524a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 13 14:11:46 2014 +0100| [785f71fcd508113a4717bd6efcb2e0545b1c2e66] | committer: Michael Niedermayer

Merge commit 'd5d2d6c3b8cff61eb26c18bbd977881cf6d5524a'

* commit 'd5d2d6c3b8cff61eb26c18bbd977881cf6d5524a':
  dcadec: initialize variables before use

Conflicts:
	libavcodec/dcadec.c

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

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