summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2003-05-29 21:34:25 +0000
committerMichael Niedermayer <michaelni@gmx.at>2003-05-29 21:34:25 +0000
commit4cdfaf8093cbd87eca1741dd945095d95d8d85ff (patch)
tree4f78e1ad0d81080e1dd21f70324a1bda5922fd6a
parent73a19b2daee20b093924c756e01bbdd20f01236b (diff)
downloadffmpeg-streaming-4cdfaf8093cbd87eca1741dd945095d95d8d85ff.zip
ffmpeg-streaming-4cdfaf8093cbd87eca1741dd945095d95d8d85ff.tar.gz
mpeg1 decoding fix
Originally committed as revision 1917 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/mpegvideo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 2cf9867..9a22d86 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -2924,7 +2924,8 @@ int ff_combine_frame( MpegEncContext *s, int next, uint8_t **buf, int *buf_size)
pc->index += *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 */
OpenPOWER on IntegriCloud