# HG changeset patch # User bcoudurier # Date 1156408671 0 # Node ID 64be40fc28a586f2dd0e3f085cf24bef39f0734d # Parent f9ba65ef0dbf65e6db30e2c6fd0d1efd6a1fb069 put dv demuxing code around ifdef diff -r f9ba65ef0dbf -r 64be40fc28a5 mov.c --- a/mov.c Thu Aug 24 08:32:52 2006 +0000 +++ b/mov.c Thu Aug 24 08:37:51 2006 +0000 @@ -1730,19 +1730,22 @@ av_log(mov->fc, AV_LOG_ERROR, "stream %d, offset 0x%llx: partial file\n", sc->ffindex, sample->pos); return -1; } - +#ifdef CONFIG_DV_DEMUXER if (sc->dv_audio_container) { dv_get_packet(mov->dv_demux, pkt); dprintf("dv audio pkt size %d\n", pkt->size); } else { +#endif url_fseek(&s->pb, sample->pos, SEEK_SET); av_get_packet(&s->pb, pkt, sample->size); +#ifdef CONFIG_DV_DEMUXER if (mov->dv_demux) { void *pkt_destruct_func = pkt->destruct; dv_produce_packet(mov->dv_demux, pkt, pkt->data, pkt->size); pkt->destruct = pkt_destruct_func; } } +#endif pkt->stream_index = sc->ffindex; pkt->dts = sample->timestamp; if (sc->ctts_data) {