[FFmpeg-cvslog] lavfi/drawutils: set subsampling for rgb too

Paul B Mahol git at videolan.org
Sun Jul 14 20:05:24 CEST 2013


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sun Jul 14 17:59:25 2013 +0000| [d5598c0963d8df3bbb5bbdec75049faaaf35eef0] | committer: Paul B Mahol

lavfi/drawutils: set subsampling for rgb too

Otherwise it is incorrectly set to 1.

Signed-off-by: Paul B Mahol <onemda at gmail.com>

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

 libavfilter/drawutils.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libavfilter/drawutils.c b/libavfilter/drawutils.c
index 1952199..a5064f8 100644
--- a/libavfilter/drawutils.c
+++ b/libavfilter/drawutils.c
@@ -180,10 +180,8 @@ int ff_draw_init(FFDrawContext *draw, enum AVPixelFormat format, unsigned flags)
     draw->format    = format;
     draw->nb_planes = nb_planes;
     memcpy(draw->pixelstep, pixelstep, sizeof(draw->pixelstep));
-    if (nb_planes >= 3 && !(desc->flags & AV_PIX_FMT_FLAG_RGB)) {
-        draw->hsub[1] = draw->hsub[2] = draw->hsub_max = desc->log2_chroma_w;
-        draw->vsub[1] = draw->vsub[2] = draw->vsub_max = desc->log2_chroma_h;
-    }
+    draw->hsub[1] = draw->hsub[2] = draw->hsub_max = desc->log2_chroma_w;
+    draw->vsub[1] = draw->vsub[2] = draw->vsub_max = desc->log2_chroma_h;
     for (i = 0; i < ((desc->nb_components - 1) | 1); i++)
         draw->comp_mask[desc->comp[i].plane] |=
             1 << (desc->comp[i].offset_plus1 - 1);



More information about the ffmpeg-cvslog mailing list