[SCM] libav/experimental: put dv demuxing code around ifdef

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 312954f05688bc917b68bfd292546341527252b8
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Thu Aug 24 08:37:51 2006 +0000

    put dv demuxing code around ifdef
    
    Originally committed as revision 6066 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mov.c b/libavformat/mov.c
index cb28dbb..10c2be3 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) {

-- 
Libav/FFmpeg packaging