diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2005-03-24 01:51:57 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-03-24 01:51:57 +0000 |
| commit | 3ce16b30f7fddec2c6a3ff046d12b5b1ffb1fb88 (patch) | |
| tree | 2eaf9a80345bb45642adf6a5b5571c355c00dd7d /libavformat | |
| parent | dffbfd06e4a554cf222e7a6f4f1f9f34a0645417 (diff) | |
| download | ffmpeg-3ce16b30f7fddec2c6a3ff046d12b5b1ffb1fb88.tar.gz | |
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
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/utils.c | 7 |
1 files 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; |