diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-01-12 09:38:13 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-01-12 18:18:23 +0100 |
| commit | 44bcab5883fcfdc9e9b1cc5315e994fd33391deb (patch) | |
| tree | 2e975383b3a7ad047feee5d8c08e34c32e814c60 | |
| parent | e5c708151e3dbf09c9564051c432b1b83a1674d0 (diff) | |
| download | ffmpeg-44bcab5883fcfdc9e9b1cc5315e994fd33391deb.tar.gz | |
ffmenc: remove references to deprecated AVFormatContext.timestamp.
| -rw-r--r-- | libavformat/ffmenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/ffmenc.c b/libavformat/ffmenc.c index d304f57ac4..b8d3d315bd 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); |