changeset 1270:64be40fc28a5 libavformat

put dv demuxing code around ifdef
author bcoudurier
date Thu, 24 Aug 2006 08:37:51 +0000
parents f9ba65ef0dbf
children 8c80d41a11cc
files mov.c
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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) {