Revision b0b83973 ffmpeg.c

View differences:

ffmpeg.c
1146 1146
                         int *frame_size)
1147 1147
{
1148 1148
    int nb_frames, i, ret;
1149
    AVFrame *final_picture, *formatted_picture, *resampling_dst, *padding_src;
1149
    AVFrame *final_picture, *formatted_picture, *resampling_dst;
1150 1150
    AVCodecContext *enc, *dec;
1151 1151
    double sync_ipts;
1152 1152

  
......
1191 1191

  
1192 1192
    formatted_picture = in_picture;
1193 1193
    final_picture = formatted_picture;
1194
    padding_src = formatted_picture;
1195 1194
    resampling_dst = &ost->pict_tmp;
1196 1195

  
1197 1196
    if (   ost->resample_height != ist->st->codec->height
......
1205 1204

  
1206 1205
#if !CONFIG_AVFILTER
1207 1206
    if (ost->video_resample) {
1208
        padding_src = NULL;
1209 1207
        final_picture = &ost->pict_tmp;
1210 1208
        if(  ost->resample_height != ist->st->codec->height
1211 1209
          || ost->resample_width  != ist->st->codec->width

Also available in: Unified diff