Skip to content

F
ffmpeg.wasm-core
Commit 4f0e712e authored by Baptiste Coudurier's avatar Baptiste Coudurier
Browse files
Options

more correct and simpler 

Originally committed as revision 11904 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent f1618fd9
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 10 deletions
libavformat/mov.c
View file @ 4f0e712e
...@@ -1539,19 +1539,12 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -1539,19 +1539,12 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
sc->ffindex, sample->pos); sc->ffindex, sample->pos);
return -1; return -1;
} }
#ifdef CONFIG_DV_DEMUXER
if (sc->dv_audio_container) {
dv_get_packet(mov->dv_demux, pkt);
dprintf(s, "dv audio pkt size %d\n", pkt->size);
} else {
#endif
av_get_packet(s->pb, pkt, sample->size); av_get_packet(s->pb, pkt, sample->size);
#ifdef CONFIG_DV_DEMUXER #ifdef CONFIG_DV_DEMUXER
if (mov->dv_demux) { if (mov->dv_demux && sc->dv_audio_container) {
void *pkt_destruct_func = pkt->destruct;
dv_produce_packet(mov->dv_demux, pkt, pkt->data, pkt->size); dv_produce_packet(mov->dv_demux, pkt, pkt->data, pkt->size);
pkt->destruct = pkt_destruct_func; av_free(pkt->data);
} dv_get_packet(mov->dv_demux, pkt);
} }
#endif #endif
pkt->stream_index = sc->ffindex; pkt->stream_index = sc->ffindex;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment