From: Benjamin Larsson Date: Thu, 25 Jan 2007 08:21:02 +0000 (+0000) Subject: Don't copy more then needed, bugfix by Gus Scheidt ellocogato at gmail dot com and... X-Git-Tag: v0.5~10358 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b6607559af1a6a482025aedd6a2c132f39dc9f62;p=platform%2Fupstream%2Flibav.git Don't copy more then needed, bugfix by Gus Scheidt ellocogato at gmail dot com and Michel Bardiaux mbardiaux at mediaxim dot be. Originally committed as revision 7702 to svn://svn.ffmpeg.org/ffmpeg/trunk --- diff --git a/libavcodec/flashsvenc.c b/libavcodec/flashsvenc.c index 2683f02..80692ee 100644 --- a/libavcodec/flashsvenc.c +++ b/libavcodec/flashsvenc.c @@ -242,7 +242,7 @@ static int flashsv_encode_frame(AVCodecContext *avctx, uint8_t *buf, int buf_siz *p = *pict; if (s->first_frame) { - s->previous_frame = av_mallocz(p->linesize[0]*s->image_height*3); + s->previous_frame = av_mallocz(p->linesize[0]*s->image_height); if (!s->previous_frame) { av_log(avctx, AV_LOG_ERROR, "Memory allocation failed.\n"); return -1; @@ -295,7 +295,7 @@ static int flashsv_encode_frame(AVCodecContext *avctx, uint8_t *buf, int buf_siz res = encode_bitstream(s, p, buf, buf_size, opt_w*16, opt_h*16, s->previous_frame, &I_frame); #endif //save the current frame - memcpy(s->previous_frame, p->data[0], s->image_height*p->linesize[0]*3); + memcpy(s->previous_frame, p->data[0], s->image_height*p->linesize[0]); //mark the frame type so the muxer can mux it correctly if (I_frame) {