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>
This commit is contained in:
@@ -310,7 +310,7 @@ static int truemotion1_decode_header(TrueMotion1Context *s)
|
||||
int width_shift = 0;
|
||||
int new_pix_fmt;
|
||||
struct frame_header header;
|
||||
uint8_t header_buffer[128]; /* logical maximum size of the header */
|
||||
uint8_t header_buffer[128] = { 0 }; /* logical maximum size of the header */
|
||||
const uint8_t *sel_vector_table;
|
||||
|
||||
header.header_size = ((s->buf[0] >> 5) | (s->buf[0] << 3)) & 0x7f;
|
||||
@@ -321,7 +321,6 @@ static int truemotion1_decode_header(TrueMotion1Context *s)
|
||||
}
|
||||
|
||||
/* unscramble the header bytes with a XOR operation */
|
||||
memset(header_buffer, 0, 128);
|
||||
for (i = 1; i < header.header_size; i++)
|
||||
header_buffer[i - 1] = s->buf[i] ^ s->buf[i + 1];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user