From ad4c3c68407fd94dc2ec7026436d6f35fe0ef013 Mon Sep 17 00:00:00 2001 From: Reuben Martin Date: Thu, 7 Oct 2010 19:15:35 +0000 Subject: [PATCH] In gxf muxer, fix flt entry offset, patch by Reuben Martin, reuben dot m at gmail dot com Originally committed as revision 25395 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/gxfenc.c | 3 ++- tests/ref/lavf/gxf | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/gxfenc.c b/libavformat/gxfenc.c index 55bba21579..fe286e2172 100644 --- a/libavformat/gxfenc.c +++ b/libavformat/gxfenc.c @@ -859,6 +859,7 @@ static int gxf_write_packet(AVFormatContext *s, AVPacket *pkt) AVStream *st = s->streams[pkt->stream_index]; int64_t pos = url_ftell(pb); int padding = 0; + int packet_start_offset = url_ftell(pb) / 1024; gxf_write_packet_header(pb, PKT_MEDIA); if (st->codec->codec_id == CODEC_ID_MPEG2VIDEO && pkt->size % 4) /* MPEG-2 frames must be padded */ @@ -878,7 +879,7 @@ static int gxf_write_packet(AVFormatContext *s, AVPacket *pkt) return -1; } } - gxf->flt_entries[gxf->flt_entries_nb++] = url_ftell(pb) / 1024; + gxf->flt_entries[gxf->flt_entries_nb++] = packet_start_offset; gxf->nb_fields += 2; // count fields } diff --git a/tests/ref/lavf/gxf b/tests/ref/lavf/gxf index 5dc3ea7d6a..84cb40d110 100644 --- a/tests/ref/lavf/gxf +++ b/tests/ref/lavf/gxf @@ -1,3 +1,3 @@ -5b9c8da067585aeb04e5fb31e021cbfd *./tests/data/lavf/lavf.gxf +8e4802de8e1f0d2f9498b6afa16f7cdf *./tests/data/lavf/lavf.gxf 796392 ./tests/data/lavf/lavf.gxf ./tests/data/lavf/lavf.gxf CRC=0xad9e86eb