[Ffmpeg-cvslog] r6066 - trunk/libavformat/mov.c

[bcoudurier]

Author: bcoudurier
Date: Thu Aug 24 10:37:51 2006
New Revision: 6066

Modified:
   trunk/libavformat/mov.c

Log:
put dv demuxing code around ifdef

Modified: trunk/libavformat/mov.c
==============================================================================
--- trunk/libavformat/mov.c	(original)
+++ trunk/libavformat/mov.c	Thu Aug 24 10:37:51 2006
@@ -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) {