[FFmpeg-cvslog] ffmenc: remove references to deprecated AVFormatContext.timestamp.
Anton Khirnov
git at videolan.org
Fri Jan 13 01:41:23 CET 2012
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Thu Jan 12 09:38:13 2012 +0100| [44bcab5883fcfdc9e9b1cc5315e994fd33391deb] | committer: Anton Khirnov
ffmenc: remove references to deprecated AVFormatContext.timestamp.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=44bcab5883fcfdc9e9b1cc5315e994fd33391deb
---
libavformat/ffmenc.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavformat/ffmenc.c b/libavformat/ffmenc.c
index d304f57..b8d3d31 100644
--- a/libavformat/ffmenc.c
+++ b/libavformat/ffmenc.c
@@ -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);
More information about the ffmpeg-cvslog
mailing list