[FFmpeg-cvslog] avcodec/mpegvideo: fix buffer clear code so it should work with negative linesizes

Michael Niedermayer git at videolan.org
Sun Feb 23 18:27:19 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 23 18:14:59 2014 +0100| [42361bdf51c4495ca71a532efbb7769475c1822c] | committer: Michael Niedermayer

avcodec/mpegvideo: fix buffer clear code so it should work with negative linesizes

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=42361bdf51c4495ca71a532efbb7769475c1822c
---

 libavcodec/mpegvideo.c |   17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index ebaeedd..441e7fc 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -1774,14 +1774,15 @@ int ff_MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx)
             return -1;
         }
 
-        memset(s->last_picture_ptr->f.data[0], 0x80,
-               avctx->height * s->last_picture_ptr->f.linesize[0]);
-        memset(s->last_picture_ptr->f.data[1], 0x80,
-               (avctx->height >> v_chroma_shift) *
-               s->last_picture_ptr->f.linesize[1]);
-        memset(s->last_picture_ptr->f.data[2], 0x80,
-               (avctx->height >> v_chroma_shift) *
-               s->last_picture_ptr->f.linesize[2]);
+        for(i=0; i<avctx->height; i++)
+            memset(s->last_picture_ptr->f.data[0] + s->last_picture_ptr->f.linesize[0]*i,
+                   0x80, avctx->width);
+        for(i=0; i<FF_CEIL_RSHIFT(avctx->height, v_chroma_shift); i++) {
+            memset(s->last_picture_ptr->f.data[1] + s->last_picture_ptr->f.linesize[1]*i,
+                   0x80, FF_CEIL_RSHIFT(avctx->width, h_chroma_shift));
+            memset(s->last_picture_ptr->f.data[2] + s->last_picture_ptr->f.linesize[2]*i,
+                   0x80, FF_CEIL_RSHIFT(avctx->width, h_chroma_shift));
+        }
 
         if(s->codec_id == AV_CODEC_ID_FLV1 || s->codec_id == AV_CODEC_ID_H263){
             for(i=0; i<avctx->height; i++)



More information about the ffmpeg-cvslog mailing list