summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibaut Mattern <tmattern@users.sourceforge.net>2005-07-25 20:27:15 +0000
committerThibaut Mattern <tmattern@users.sourceforge.net>2005-07-25 20:27:15 +0000
commit57531db7d8dc47cc3d6efeb5f8900c3950b81731 (patch)
treebd793a66777b714144590d1a48b32dbd3a86d884
parent5661631e64d7991f8b43733cd90e7e2c5f1b02af (diff)
downloadxine-lib-57531db7d8dc47cc3d6efeb5f8900c3950b81731.tar.gz
xine-lib-57531db7d8dc47cc3d6efeb5f8900c3950b81731.tar.bz2
*BUGFIX*
Argl, always the same error. Fixed random bugs, and playback of this stream : http://naboo.homelinux.org/~tmattern/samples/mov/tidemo1-24bit-rle.mov CVS patchset: 7679 CVS date: 2005/07/25 20:27:15
-rw-r--r--src/libffmpeg/video_decoder.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libffmpeg/video_decoder.c b/src/libffmpeg/video_decoder.c
index 15501922e..9bdaf7ed2 100644
--- a/src/libffmpeg/video_decoder.c
+++ b/src/libffmpeg/video_decoder.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: video_decoder.c,v 1.55 2005/06/10 22:40:41 tmattern Exp $
+ * $Id: video_decoder.c,v 1.56 2005/07/25 20:27:15 tmattern Exp $
*
* xine video decoder plugin using ffmpeg
*
@@ -1070,8 +1070,10 @@ static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) {
this->size = buf->size;
lprintf("no memcpy needed to accumulate data\n");
} else {
- /* copy */
+ /* copy data into our internal buffer */
ff_check_bufsize(this, this->size + buf->size + FF_INPUT_BUFFER_PADDING_SIZE);
+ chunk_buf = this->buf; /* ff_check_bufsize might realloc this->buf */
+
xine_fast_memcpy (&this->buf[this->size], buf->content, buf->size);
this->size += buf->size;