[FFmpeg-cvslog] avcodec/h264: clear chroma planes when flags gray is used

Michael Niedermayer git at videolan.org
Mon Feb 24 09:55:01 CET 2014


ffmpeg | branch: release/2.1 | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 23 18:20:05 2014 +0100| [c7c724056ef4998a7ecc881457c2b90074490bbd] | committer: Carl Eugen Hoyos

avcodec/h264: clear chroma planes when flags gray is used

Fixes Ticket3397
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 72e691314027b08955679319394dd0d8477973b7)

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

 libavcodec/h264.c |   12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 2ee9e43..6c2efba 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -452,6 +452,18 @@ static int alloc_picture(H264Context *h, Picture *pic)
             pic->hwaccel_picture_private = pic->hwaccel_priv_buf->data;
         }
     }
+    if (!h->avctx->hwaccel && CONFIG_GRAY && h->flags & CODEC_FLAG_GRAY && pic->f.data[2]) {
+        int h_chroma_shift, v_chroma_shift;
+        av_pix_fmt_get_chroma_sub_sample(pic->f.format,
+                                         &h_chroma_shift, &v_chroma_shift);
+
+        for(i=0; i<FF_CEIL_RSHIFT(h->avctx->height, v_chroma_shift); i++) {
+            memset(pic->f.data[1] + pic->f.linesize[1]*i,
+                   0x80, FF_CEIL_RSHIFT(h->avctx->width, h_chroma_shift));
+            memset(pic->f.data[2] + pic->f.linesize[2]*i,
+                   0x80, FF_CEIL_RSHIFT(h->avctx->width, h_chroma_shift));
+        }
+    }
 
     if (!h->qscale_table_pool) {
         ret = init_table_pools(h);



More information about the ffmpeg-cvslog mailing list