diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-08-24 08:37:51 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-08-24 08:37:51 +0000 |
| commit | 312954f05688bc917b68bfd292546341527252b8 (patch) | |
| tree | 1ca28ab845ca270afb18241acd3a514cab190c62 /libavformat/mov.c | |
| parent | 989ac5a685a3fb5a038d050dc66f0c8621886d76 (diff) | |
| download | ffmpeg-312954f05688bc917b68bfd292546341527252b8.tar.gz | |
put dv demuxing code around ifdef
Originally committed as revision 6066 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 5 |
1 files changed, 4 insertions, 1 deletions
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) { |