]> git.sesse.net Git - ffmpeg/commitdiff
ffmenc: remove references to deprecated AVFormatContext.timestamp.
authorAnton Khirnov <anton@khirnov.net>
Thu, 12 Jan 2012 08:38:13 +0000 (09:38 +0100)
committerAnton Khirnov <anton@khirnov.net>
Thu, 12 Jan 2012 17:18:23 +0000 (18:18 +0100)
libavformat/ffmenc.c

index d304f57ac4cbead59f16d8d69919decb9d006c7c..b8d3d315bd79fc459c0c63ac88dea5a381722312 100644 (file)
@@ -205,7 +205,7 @@ static int ffm_write_packet(AVFormatContext *s, AVPacket *pkt)
     uint8_t header[FRAME_HEADER_SIZE+4];
     int header_size = FRAME_HEADER_SIZE;
 
-    dts = s->timestamp + pkt->dts;
+    dts = pkt->dts;
     /* packet size & key_frame */
     header[0] = pkt->stream_index;
     header[1] = 0;
@@ -213,7 +213,7 @@ static int ffm_write_packet(AVFormatContext *s, AVPacket *pkt)
         header[1] |= FLAG_KEY_FRAME;
     AV_WB24(header+2, pkt->size);
     AV_WB24(header+5, pkt->duration);
-    AV_WB64(header+8, s->timestamp + pkt->pts);
+    AV_WB64(header+8, pkt->pts);
     if (pkt->pts != pkt->dts) {
         header[1] |= FLAG_DTS;
         AV_WB32(header+16, pkt->pts - pkt->dts);