From 8e6f8869ab371e676e7c22db986bbd321d34e1c3 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 27 May 2008 19:44:56 +0000 Subject: [PATCH] Do not read from prior the array, fix CID 127. Originally committed as revision 13471 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/imgconvert.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 1dcddaa48d..663095435e 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)