mpeg1 decoding fix
Originally committed as revision 1917 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
73a19b2dae
commit
4cdfaf8093
@ -2924,7 +2924,8 @@ int ff_combine_frame( MpegEncContext *s, int next, uint8_t **buf, int *buf_size)
|
|||||||
pc->index += *buf_size;
|
pc->index += *buf_size;
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
*buf_size=
|
||||||
pc->overread_index= pc->index + next;
|
pc->overread_index= pc->index + next;
|
||||||
|
|
||||||
/* append to buffer */
|
/* 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 );
|
memcpy(&pc->buffer[pc->index], *buf, next + FF_INPUT_BUFFER_PADDING_SIZE );
|
||||||
pc->index = 0;
|
pc->index = 0;
|
||||||
*buf= pc->buffer;
|
*buf= pc->buffer;
|
||||||
*buf_size= pc->last_index + next;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* store overread bytes */
|
/* store overread bytes */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user