From 2de28abbfd3d4d7a8cd5a6c04a35273945049dc2 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 18 Apr 2004 11:22:35 +0000 Subject: [PATCH] 10l (segfault fix) Originally committed as revision 3029 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffmpeg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ffmpeg.c b/ffmpeg.c index 5c8a84d010..689e6c0bf2 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -1422,16 +1422,17 @@ static int av_encode(AVFormatContext **output_files, ost->padleft = frame_padleft; ost->padbottom = frame_padbottom; ost->padright = frame_padright; + avcodec_get_frame_defaults(&ost->pict_tmp); if( avpicture_alloc( (AVPicture*)&ost->pict_tmp, PIX_FMT_YUV420P, codec->width, codec->height ) ) goto fail; } else { ost->video_resample = 1; ost->video_crop = 0; // cropping is handled as part of resample + avcodec_get_frame_defaults(&ost->pict_tmp); if( avpicture_alloc( (AVPicture*)&ost->pict_tmp, PIX_FMT_YUV420P, codec->width, codec->height ) ) goto fail; - avcodec_get_frame_defaults(&ost->pict_tmp); ost->img_resample_ctx = img_resample_full_init( ost->st->codec.width, ost->st->codec.height,