RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ffmenc: remove references to deprecated AVFormatContext.timestamp.

This commit is contained in:
Anton Khirnov 2012-01-12 09:38:13 +01:00
parent e5c708151e
commit 44bcab5883
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/ffmenc.c
View File

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