videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

put dv demuxing code around ifdef 

Originally committed as revision 6066 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2006-08-24 08:37:51 +00:00
parent 989ac5a685
commit 312954f056
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/mov.c
View File

@ -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) {