diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-29 01:41:04 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-29 04:11:10 +0200 |
commit | d40ff29cacf9b8ffa1061392a0e9b3056c4882ea (patch) | |
tree | 3b59f4b9a74e209220f0b0dcb90c466e3e4a9b3d /libavcodec/wmavoice.c | |
parent | 99bb88c588ea9a46a06b966b9014394385ebe1c3 (diff) | |
parent | 44257ef4267f01dd698c8ab8abf50fd77136a8ce (diff) | |
download | ffmpeg-d40ff29cacf9b8ffa1061392a0e9b3056c4882ea.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
asf: only set index_read if the index contained entries.
cabac: add overread protection to BRANCHLESS_GET_CABAC().
cabac: increment jump locations by one in callers of BRANCHLESS_GET_CABAC().
cabac: remove unused argument from BRANCHLESS_GET_CABAC_UPDATE().
cabac: use struct+offset instead of memory operand in BRANCHLESS_GET_CABAC().
h264: add overread protection to get_cabac_bypass_sign_x86().
h264: reindent get_cabac_bypass_sign_x86().
h264: use struct offsets in get_cabac_bypass_sign_x86().
h264: fix overreads in cabac reader.
wmall: fix seeking.
lagarith: fix buffer overreads.
dvdec: drop unnecessary dv_tablegen.h #include
build: fix doc generation errors in parallel builds
Replace memset(0) by zero initializations.
faandct: Remove FAAN_POSTSCALE define and related code.
dvenc: print allowed profiles if the video doesn't conform to any of them.
avcodec_encode_{audio,video}: only reallocate output packet when it has non-zero size.
FATE: add a test for vp8 with changing frame size.
fate: add kgv1 fate test.
oggdec: calculate correct timestamps in Ogg/FLAC
Conflicts:
libavcodec/4xm.c
libavcodec/cook.c
libavcodec/dvdata.c
libavcodec/dvdsubdec.c
libavcodec/lagarith.c
libavcodec/lagarithrac.c
libavcodec/utils.c
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmavoice.c')
-rw-r--r-- | libavcodec/wmavoice.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c index 66c0ce40d3..48b79014a6 100644 --- a/libavcodec/wmavoice.c +++ b/libavcodec/wmavoice.c @@ -318,10 +318,9 @@ static av_cold int decode_vbmtree(GetBitContext *gb, int8_t vbm_tree[25]) 0x0ffc, 0x0ffd, 0x0ffe, // 1111111111+00/01/10 0x3ffc, 0x3ffd, 0x3ffe, 0x3fff // 111111111111+xx }; - int cntr[8], n, res; + int cntr[8] = { 0 }, n, res; memset(vbm_tree, 0xff, sizeof(vbm_tree[0]) * 25); - memset(cntr, 0, sizeof(cntr)); for (n = 0; n < 17; n++) { res = get_bits(gb, 3); if (cntr[res] > 3) // should be >= 3 + (res == 7)) |