Revision 3fd62c6e ffmpeg.c

View differences:

ffmpeg.c
1428 1428
    int ret, i;
1429 1429
    int got_output;
1430 1430
    AVFrame picture;
1431
    void *buffer_to_free;
1431
    void *buffer_to_free = NULL;
1432 1432
    static unsigned int samples_size= 0;
1433 1433
    AVSubtitle subtitle, *subtitle_to_free;
1434 1434
    int64_t pkt_pts = AV_NOPTS_VALUE;
......
1530 1530
                            ist->st->codec->time_base.den;
1531 1531
                    }
1532 1532
                    avpkt.size = 0;
1533
                    buffer_to_free = NULL;
1534
                    pre_process_video_frame(ist, (AVPicture *)&picture, &buffer_to_free);
1533 1535
                    break;
1534 1536
            case AVMEDIA_TYPE_SUBTITLE:
1535 1537
                ret = avcodec_decode_subtitle2(ist->st->codec,
......
1564 1566
            avpkt.size = 0;
1565 1567
        }
1566 1568

  
1567
        buffer_to_free = NULL;
1568
        if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
1569
            pre_process_video_frame(ist, (AVPicture *)&picture,
1570
                                    &buffer_to_free);
1571
        }
1572

  
1573 1569
#if CONFIG_AVFILTER
1574 1570
        if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && ist->input_video_filter) {
1575 1571
            AVRational sar;

Also available in: Unified diff