diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-13 14:11:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-13 14:21:18 +0100 |
| commit | 785f71fcd508113a4717bd6efcb2e0545b1c2e66 (patch) | |
| tree | 10569a5ffb2927db648692890eb7d9e4ed7ff909 | |
| parent | 2c4d5d3497e92f37604ab20d14bc509c14b08992 (diff) | |
| parent | d5d2d6c3b8cff61eb26c18bbd977881cf6d5524a (diff) | |
| download | ffmpeg-785f71fcd508113a4717bd6efcb2e0545b1c2e66.tar.gz | |
Merge commit 'd5d2d6c3b8cff61eb26c18bbd977881cf6d5524a'
* commit 'd5d2d6c3b8cff61eb26c18bbd977881cf6d5524a':
dcadec: initialize variables before use
Conflicts:
libavcodec/dcadec.c
See: 53918a1c54b49e76c3ca517e2caada8372995712
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/dcadec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index 877451046c..300dc2e932 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -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) |