From 312954f05688bc917b68bfd292546341527252b8 Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Thu, 24 Aug 2006 08:37:51 +0000 Subject: [PATCH] put dv demuxing code around ifdef Originally committed as revision 6066 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/mov.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index cb28dbbcef..10c2be3016 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1730,19 +1730,22 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt) 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) {