From f122deb45cbd00ef0e1726e79dd3658b553d1eab Mon Sep 17 00:00:00 2001 From: Luca Abeni Date: Mon, 10 Apr 2006 10:16:13 +0000 Subject: [PATCH] Cosmetic patch: fix indentation (broken by previous cropping / padding patch) Originally committed as revision 5280 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffmpeg.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index 0393a085e5..e29a00ef50 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -804,28 +804,28 @@ static void do_video_out(AVFormatContext *s, img_resample(ost->img_resample_ctx, (AVPicture *)resampling_dst, (AVPicture*)formatted_picture); } - if (enc->pix_fmt != target_pixfmt) { - int size; - - av_free(buf); - /* create temporary picture */ - size = avpicture_get_size(enc->pix_fmt, enc->width, enc->height); - buf = av_malloc(size); - if (!buf) - return; - final_picture = &picture_format_temp; - avpicture_fill((AVPicture*)final_picture, buf, enc->pix_fmt, enc->width, enc->height); - - if (img_convert((AVPicture*)final_picture, enc->pix_fmt, - (AVPicture*)&ost->pict_tmp, target_pixfmt, - enc->width, enc->height) < 0) { + if (enc->pix_fmt != target_pixfmt) { + int size; - if (verbose >= 0) - fprintf(stderr, "pixel format conversion not handled\n"); + av_free(buf); + /* create temporary picture */ + size = avpicture_get_size(enc->pix_fmt, enc->width, enc->height); + buf = av_malloc(size); + if (!buf) + return; + final_picture = &picture_format_temp; + avpicture_fill((AVPicture*)final_picture, buf, enc->pix_fmt, enc->width, enc->height); - goto the_end; - } + if (img_convert((AVPicture*)final_picture, enc->pix_fmt, + (AVPicture*)&ost->pict_tmp, target_pixfmt, + enc->width, enc->height) < 0) { + + if (verbose >= 0) + fprintf(stderr, "pixel format conversion not handled\n"); + + goto the_end; } + } if (ost->video_pad) { img_pad((AVPicture*)final_picture, (AVPicture *)padding_src, -- GitLab