Browse Source

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

patch)

Originally committed as revision 5280 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Luca Abeni 19 years ago
parent
commit
f122deb45c
1 changed files with 19 additions and 19 deletions
  1. +19
    -19
      ffmpeg.c

+ 19
- 19
ffmpeg.c View File

@@ -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,


Loading…
Cancel
Save