apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-11-03 01:33:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
patch)

Originally committed as revision 5280 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Luca Abeni
2006-04-10 10:16:13 +00:00
parent 07d0cdfc9f
commit f122deb45c
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
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); 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); av_free(buf);
/* create temporary picture */ /* create temporary picture */
size = avpicture_get_size(enc->pix_fmt, enc->width, enc->height); size = avpicture_get_size(enc->pix_fmt, enc->width, enc->height);
buf = av_malloc(size); buf = av_malloc(size);
if (!buf) if (!buf)
return; return;
final_picture = &picture_format_temp; final_picture = &picture_format_temp;
avpicture_fill((AVPicture*)final_picture, buf, enc->pix_fmt, enc->width, enc->height); avpicture_fill((AVPicture*)final_picture, buf, enc->pix_fmt, enc->width, enc->height);
if (img_convert((AVPicture*)final_picture, enc->pix_fmt, if (img_convert((AVPicture*)final_picture, enc->pix_fmt,
(AVPicture*)&ost->pict_tmp, target_pixfmt, (AVPicture*)&ost->pict_tmp, target_pixfmt,
enc->width, enc->height) < 0) { enc->width, enc->height) < 0) {
if (verbose >= 0) if (verbose >= 0)
fprintf(stderr, "pixel format conversion not handled\n"); fprintf(stderr, "pixel format conversion not handled\n");
goto the_end; 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,