[Ffmpeg-cvslog] CVS: ffmpeg ffmpeg.c,1.377,1.378
Luca Abeni CVS
lucabe
Mon Apr 10 12:16:15 CEST 2006
Update of /cvsroot/ffmpeg/ffmpeg
In directory mail:/var2/tmp/cvs-serv692
Modified Files:
ffmpeg.c
Log Message:
Cosmetic patch: fix indentation (broken by previous cropping / padding
patch)
Index: ffmpeg.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/ffmpeg.c,v
retrieving revision 1.377
retrieving revision 1.378
diff -u -d -r1.377 -r1.378
--- ffmpeg.c 10 Apr 2006 09:04:15 -0000 1.377
+++ ffmpeg.c 10 Apr 2006 10:16:13 -0000 1.378
@@ -804,28 +804,28 @@
img_resample(ost->img_resample_ctx, (AVPicture *)resampling_dst, (AVPicture*)formatted_picture);
}
- if (enc->pix_fmt != target_pixfmt) {
- int size;
+ 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);
+ 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 (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");
+ if (verbose >= 0)
+ fprintf(stderr, "pixel format conversion not handled\n");
- goto the_end;
- }
+ goto the_end;
}
+ }
if (ost->video_pad) {
img_pad((AVPicture*)final_picture, (AVPicture *)padding_src,
More information about the ffmpeg-cvslog
mailing list