[FFmpeg-cvslog] r25395 - in trunk: libavformat/gxfenc.c tests/ref/lavf/gxf

bcoudurier subversion
Thu Oct 7 21:15:35 CEST 2010


Author: bcoudurier
Date: Thu Oct  7 21:15:35 2010
New Revision: 25395

Log:
In gxf muxer, fix flt entry offset, patch by Reuben Martin, reuben dot m at gmail dot com

Modified:
   trunk/libavformat/gxfenc.c
   trunk/tests/ref/lavf/gxf

Modified: trunk/libavformat/gxfenc.c
==============================================================================
--- trunk/libavformat/gxfenc.c	Thu Oct  7 21:10:51 2010	(r25394)
+++ trunk/libavformat/gxfenc.c	Thu Oct  7 21:15:35 2010	(r25395)
@@ -859,6 +859,7 @@ static int gxf_write_packet(AVFormatCont
     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(AVFormatCont
                 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
     }
 

Modified: trunk/tests/ref/lavf/gxf
==============================================================================
--- trunk/tests/ref/lavf/gxf	Thu Oct  7 21:10:51 2010	(r25394)
+++ trunk/tests/ref/lavf/gxf	Thu Oct  7 21:15:35 2010	(r25395)
@@ -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



More information about the ffmpeg-cvslog mailing list