Merge commit 'd5d2d6c3b8cff61eb26c18bbd977881cf6d5524a'

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

Conflicts:
	libavcodec/dcadec.c

See: 53918a1c54b49e76c3ca517e2caada8372995712
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-11-13 14:11:46 +01:00
commit 785f71fcd5

View File

@ -1637,7 +1637,7 @@ static int dca_exss_parse_asset_header(DCAContext *s)
int embedded_stereo = 0;
int embedded_6ch = 0;
int drc_code_present;
int av_uninit(extensions_mask);
int extensions_mask = 0;
int i, j;
if (get_bits_left(&s->gb) < 16)