From 507ff760afa91f77e82110fc6193808c5e0973bc Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Tue, 20 Jan 2009 09:43:58 +0000 Subject: Do not use avctx->frame_number which might not be set, this also fixes a side effect where its value was one too much. Originally committed as revision 16701 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/gxfenc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'libavformat/gxfenc.c') diff --git a/libavformat/gxfenc.c b/libavformat/gxfenc.c index 229acc9..77a2927 100644 --- a/libavformat/gxfenc.c +++ b/libavformat/gxfenc.c @@ -693,11 +693,8 @@ static int gxf_write_trailer(AVFormatContext *s) int i; for (i = 0; i < s->nb_streams; ++i) { - if (s->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) { + if (s->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) av_fifo_free(&gxf->streams[i].audio_buffer); - } else if (s->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO) { - gxf->nb_frames = 2 * s->streams[i]->codec->frame_number; - } } gxf_write_eos_packet(pb, gxf); @@ -772,6 +769,10 @@ static int gxf_write_media_packet(ByteIOContext *pb, GXFContext *ctx, AVPacket * gxf_write_media_preamble(pb, ctx, pkt, pkt->size + padding); put_buffer(pb, pkt->data, pkt->size); gxf_write_padding(pb, padding); + + if (sc->codec->codec_type == CODEC_TYPE_VIDEO) + ctx->nb_frames += 2; // count fields + return updatePacketSize(pb, pos); } -- cgit v1.1