[SCM] libav/experimental: Do not read from prior the array, fix CID 127.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:22:09 UTC 2013


The following commit has been merged in the experimental branch:
commit 8e6f8869ab371e676e7c22db986bbd321d34e1c3
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Tue May 27 19:44:56 2008 +0000

    Do not read from prior the array, fix CID 127.
    
    Originally committed as revision 13471 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index 1dcddaa..6630954 100644
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -407,16 +407,16 @@ enum PixelFormat avcodec_get_pix_fmt(const char* name)
 
 void avcodec_pix_fmt_string (char *buf, int buf_size, int pix_fmt)
 {
-    PixFmtInfo info= pix_fmt_info[pix_fmt];
-
-    char is_alpha_char= info.is_alpha ? 'y' : 'n';
-
     /* print header */
     if (pix_fmt < 0)
         snprintf (buf, buf_size,
                   "name      " " nb_channels" " depth" " is_alpha"
             );
-    else
+    else{
+        PixFmtInfo info= pix_fmt_info[pix_fmt];
+
+        char is_alpha_char= info.is_alpha ? 'y' : 'n';
+
         snprintf (buf, buf_size,
                   "%-10s" "      %1d     " "   %2d " "     %c   ",
                   info.name,
@@ -424,6 +424,7 @@ void avcodec_pix_fmt_string (char *buf, int buf_size, int pix_fmt)
                   info.depth,
                   is_alpha_char
             );
+    }
 }
 
 int ff_fill_linesize(AVPicture *picture, int pix_fmt, int width)

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list