Commit f0719d2f authored by lucabe's avatar lucabe

Cosmetic patch: fix indentation (broken by previous cropping / padding

patch)


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@5280 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 67fce945
...@@ -804,28 +804,28 @@ static void do_video_out(AVFormatContext *s, ...@@ -804,28 +804,28 @@ static void do_video_out(AVFormatContext *s,
img_resample(ost->img_resample_ctx, (AVPicture *)resampling_dst, (AVPicture*)formatted_picture); img_resample(ost->img_resample_ctx, (AVPicture *)resampling_dst, (AVPicture*)formatted_picture);
} }
if (enc->pix_fmt != target_pixfmt) { if (enc->pix_fmt != target_pixfmt) {
int size; 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 (verbose >= 0) av_free(buf);
fprintf(stderr, "pixel format conversion not handled\n"); /* 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) { if (ost->video_pad) {
img_pad((AVPicture*)final_picture, (AVPicture *)padding_src, img_pad((AVPicture*)final_picture, (AVPicture *)padding_src,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment