From 3ce16b30f7fddec2c6a3ff046d12b5b1ffb1fb88 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 24 Mar 2005 01:51:57 +0000 Subject: [PATCH] discard dummy packets before doing inapropriate checks on them and failing as a result Originally committed as revision 4078 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/utils.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index b4701a0ffe..97b060daa6 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2301,12 +2301,13 @@ static int av_interleave_packet(AVFormatContext *s, AVPacket *out, AVPacket *in, int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt){ AVStream *st= s->streams[ pkt->stream_index]; - if(compute_pkt_fields2(st, pkt) < 0) - return -1; - //FIXME/XXX/HACK drop zero sized packets if(st->codec.codec_type == CODEC_TYPE_AUDIO && pkt->size==0) return 0; + +//av_log(NULL, AV_LOG_DEBUG, "av_interleaved_write_frame %d %Ld %Ld\n", pkt->size, pkt->dts, pkt->pts); + if(compute_pkt_fields2(st, pkt) < 0) + return -1; if(pkt->dts == AV_NOPTS_VALUE) return -1;