Commit 4cdfaf80 authored by Michael Niedermayer's avatar Michael Niedermayer

mpeg1 decoding fix

Originally committed as revision 1917 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 73a19b2d
......@@ -2925,6 +2925,7 @@ int ff_combine_frame( MpegEncContext *s, int next, uint8_t **buf, int *buf_size)
return -1;
}
*buf_size=
pc->overread_index= pc->index + next;
/* append to buffer */
......@@ -2934,7 +2935,6 @@ int ff_combine_frame( MpegEncContext *s, int next, uint8_t **buf, int *buf_size)
memcpy(&pc->buffer[pc->index], *buf, next + FF_INPUT_BUFFER_PADDING_SIZE );
pc->index = 0;
*buf= pc->buffer;
*buf_size= pc->last_index + next;
}
/* store overread bytes */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment