virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

10l (segfault fix)

Browse Source 
Originally committed as revision 3029 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2004-04-18 11:22:35 +00:00
parent a4d36c1113
commit 2de28abbfd
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ffmpeg.c
View File

@ -1422,16 +1422,17 @@ static int av_encode(AVFormatContext **output_files,
ost->padleft = frame_padleft; ost->padleft = frame_padleft;
ost->padbottom = frame_padbottom; ost->padbottom = frame_padbottom;
ost->padright = frame_padright; ost->padright = frame_padright;
avcodec_get_frame_defaults(&ost->pict_tmp);
if( avpicture_alloc( (AVPicture*)&ost->pict_tmp, PIX_FMT_YUV420P, if( avpicture_alloc( (AVPicture*)&ost->pict_tmp, PIX_FMT_YUV420P,
codec->width, codec->height ) ) codec->width, codec->height ) )
goto fail; goto fail;
} else { } else {
ost->video_resample = 1; ost->video_resample = 1;
ost->video_crop = 0; // cropping is handled as part of resample 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, if( avpicture_alloc( (AVPicture*)&ost->pict_tmp, PIX_FMT_YUV420P,
codec->width, codec->height ) ) codec->width, codec->height ) )
goto fail; goto fail;
avcodec_get_frame_defaults(&ost->pict_tmp);
ost->img_resample_ctx = img_resample_full_init( ost->img_resample_ctx = img_resample_full_init(
ost->st->codec.width, ost->st->codec.height, ost->st->codec.width, ost->st->codec.height,