From da0b94f539a2dab7e150a419fa90b4d0d6ff9b84 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 2 Sep 2007 15:58:43 +0000 Subject: [PATCH] workaround ms (lack of) intelligence in their design of dvr-ms yes kids you do not make 90% of your file contain empty dummy packets closes issue76 Originally committed as revision 10280 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/asf.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libavformat/asf.c b/libavformat/asf.c index 4aa98f6fa2..9cebd4c3da 100644 --- a/libavformat/asf.c +++ b/libavformat/asf.c @@ -826,6 +826,19 @@ static int asf_read_packet(AVFormatContext *s, AVPacket *pkt) asf_st->frag_offset += asf->packet_frag_size; /* test if whole packet is read */ if (asf_st->frag_offset == asf_st->pkt.size) { + //workaround for macroshit radio DVR-MS files + if( s->streams[asf->stream_index]->codec->codec_id == CODEC_ID_MPEG2VIDEO + && asf_st->pkt.size > 100){ + int i; + for(i=0; ipkt.size && !asf_st->pkt.data[i]; i++); + if(i == asf_st->pkt.size){ + av_log(s, AV_LOG_DEBUG, "discarding ms fart\n"); + asf_st->frag_offset = 0; + av_free_packet(&asf_st->pkt); + continue; + } + } + /* return packet */ if (asf_st->ds_span > 1) { if(asf_st->pkt.size != asf_st->ds_packet_size * asf_st->ds_span){