diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-07 04:14:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-07 04:14:09 +0200 |
| commit | e5a85164b100620fe529bae0ce623956f0bab2e9 (patch) | |
| tree | 4732dbaa6666e2448c33a32956b074f51105243d /libavcodec | |
| parent | c60d2be5510044edf01d813363e39841db3d751a (diff) | |
| parent | 45a811b512b47acf060247ad0bc7022cada5533b (diff) | |
| download | ffmpeg-e5a85164b100620fe529bae0ce623956f0bab2e9.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
mov: fix composition timestamps on movie fragments.
wmavoice: Use proper size in memeset().
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/wmavoice.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c index cd640b01fc..3604eac782 100644 --- a/libavcodec/wmavoice.c +++ b/libavcodec/wmavoice.c @@ -315,7 +315,7 @@ static av_cold int decode_vbmtree(GetBitContext *gb, int8_t vbm_tree[25]) }; int cntr[8], n, res; - memset(vbm_tree, 0xff, sizeof(vbm_tree)); + 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); |