Revision 49fb20cb libavformat/avidec.c

View differences:

libavformat/avidec.c
350 350
                av_freep(&s->streams[0]->codec->extradata);
351 351
                av_freep(&s->streams[0]);
352 352
                s->nb_streams = 0;
353
                if (ENABLE_DV_DEMUXER) {
353
                if (CONFIG_DV_DEMUXER) {
354 354
                    avi->dv_demux = dv_init_demux(s);
355 355
                    if (!avi->dv_demux)
356 356
                        goto fail;
......
636 636
    int64_t i, sync;
637 637
    void* dstr;
638 638

  
639
    if (ENABLE_DV_DEMUXER && avi->dv_demux) {
639
    if (CONFIG_DV_DEMUXER && avi->dv_demux) {
640 640
        size = dv_get_packet(avi->dv_demux, pkt);
641 641
        if (size >= 0)
642 642
            return size;
......
721 721
                memcpy(pkt->data + pkt->size - 4*256, ast->pal, 4*256);
722 722
        }
723 723

  
724
        if (ENABLE_DV_DEMUXER && avi->dv_demux) {
724
        if (CONFIG_DV_DEMUXER && avi->dv_demux) {
725 725
            dstr = pkt->destruct;
726 726
            size = dv_produce_packet(avi->dv_demux, pkt,
727 727
                                    pkt->data, pkt->size);
......
1012 1012

  
1013 1013
//    av_log(NULL, AV_LOG_DEBUG, "XX %"PRId64" %d %"PRId64"\n", timestamp, index, st->index_entries[index].timestamp);
1014 1014

  
1015
    if (ENABLE_DV_DEMUXER && avi->dv_demux) {
1015
    if (CONFIG_DV_DEMUXER && avi->dv_demux) {
1016 1016
        /* One and only one real stream for DV in AVI, and it has video  */
1017 1017
        /* offsets. Calling with other stream indexes should have failed */
1018 1018
        /* the av_index_search_timestamp call above.                     */

Also available in: Unified diff