[FFmpeg-cvslog] vf_drawbox: dont move uninitialized and then unused colors around

Michael Niedermayer git at videolan.org
Tue Nov 6 21:44:56 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov  6 21:40:23 2012 +0100| [44e9d7f182bb3b6b4982f3243634c4a4a3d2b51d] | committer: Michael Niedermayer

vf_drawbox: dont move uninitialized and then unused colors around

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

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

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

diff --git a/libavfilter/vf_drawbox.c b/libavfilter/vf_drawbox.c
index ecedb21..3509ccd 100644
--- a/libavfilter/vf_drawbox.c
+++ b/libavfilter/vf_drawbox.c
@@ -82,10 +82,12 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
     else if (av_parse_color(rgba_color, drawbox->color_str, -1, ctx) < 0)
         return AVERROR(EINVAL);
 
-    drawbox->yuv_color[Y] = RGB_TO_Y_CCIR(rgba_color[0], rgba_color[1], rgba_color[2]);
-    drawbox->yuv_color[U] = RGB_TO_U_CCIR(rgba_color[0], rgba_color[1], rgba_color[2], 0);
-    drawbox->yuv_color[V] = RGB_TO_V_CCIR(rgba_color[0], rgba_color[1], rgba_color[2], 0);
-    drawbox->yuv_color[A] = rgba_color[3];
+    if (!drawbox->invert_color) {
+        drawbox->yuv_color[Y] = RGB_TO_Y_CCIR(rgba_color[0], rgba_color[1], rgba_color[2]);
+        drawbox->yuv_color[U] = RGB_TO_U_CCIR(rgba_color[0], rgba_color[1], rgba_color[2], 0);
+        drawbox->yuv_color[V] = RGB_TO_V_CCIR(rgba_color[0], rgba_color[1], rgba_color[2], 0);
+        drawbox->yuv_color[A] = rgba_color[3];
+    }
 
     return 0;
 }



More information about the ffmpeg-cvslog mailing list