RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'c34df422628e6b7b657faee241fe7bb2629e0f57' 

* commit 'c34df422628e6b7b657faee241fe7bb2629e0f57':
  sgienc: Make sure to initialize skipped header portions

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-12-18 14:39:59 +01:00
parent 362028cac9 c34df42262
commit ef9ae0e748
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/sgienc.c
View File

@ -96,7 +96,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
const AVFrame * const p = frame;
PutByteContext pbc;
uint8_t *in_buf, *encode_buf;
int x, y, z, length, tablesize, ret;
int x, y, z, length, tablesize, ret, i;
unsigned int width, height, depth, dimension;
unsigned int bytes_per_channel, pixmax, put_be;
@ -187,13 +187,15 @@ FF_ENABLE_DEPRECATION_WARNINGS
bytestream2_put_be32(&pbc, 0L); /* dummy */
/* name */
bytestream2_skip_p(&pbc, 80);
for (i = 0; i < 80; i++)
bytestream2_put_byte(&pbc, 0L);
/* colormap */
bytestream2_put_be32(&pbc, 0L);
/* The rest of the 512 byte header is unused. */
bytestream2_skip_p(&pbc, 404);
for (i = 0; i < 404; i++)
bytestream2_put_byte(&pbc, 0L);
if (s->rle) {
PutByteContext taboff_pcb, tablen_pcb;