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/4xm.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/4xm.c')
| -rw-r--r-- | libavcodec/4xm.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index 53ee855160..600cf81ccd 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -578,7 +578,7 @@ static int decode_i_mb(FourXContext *f) static const uint8_t *read_huffman_tables(FourXContext *f, const uint8_t * const buf, int buf_size) { - int frequency[512]; + int frequency[512] = { 0 }; uint8_t flag[512]; int up[512]; uint8_t len_tab[257]; @@ -588,7 +588,6 @@ static const uint8_t *read_huffman_tables(FourXContext *f, const uint8_t *ptr_end = buf + buf_size; int j; - memset(frequency, 0, sizeof(frequency)); memset(up, -1, sizeof(up)); start = *ptr++; @@ -691,10 +690,9 @@ static int decode_i2_frame(FourXContext *f, const uint8_t *buf, int length) for (y = 0; y < height; y += 16) { for (x = 0; x < width; x += 16) { - unsigned int color[4], bits; + unsigned int color[4] = { 0 }, bits; if (buf_end - buf < 8) return -1; - memset(color, 0, sizeof(color)); // warning following is purely guessed ... color[0] = bytestream2_get_le16u(&g3); color[1] = bytestream2_get_le16u(&g3); |