diff options
| -rw-r--r-- | libavformat/mpegtsenc.c | 5 | ||||
| -rw-r--r-- | tests/libav.regression.ref | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 0170a5acb8..82b8d88fb3 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -672,6 +672,7 @@ static int mpegts_write_packet(AVFormatContext *s, AVPacket *pkt) MpegTSWriteStream *ts_st = st->priv_data; int len, max_payload_size; const uint8_t *access_unit_index = NULL; + const uint64_t delay = av_rescale(s->max_delay, 90000, AV_TIME_BASE); if (st->codec->codec_type == CODEC_TYPE_SUBTITLE) { /* for subtitle, a single PES packet must be generated */ @@ -717,8 +718,8 @@ static int mpegts_write_packet(AVFormatContext *s, AVPacket *pkt) if (access_unit_index && access_unit_index < buf && ts_st->payload_pts == AV_NOPTS_VALUE && ts_st->payload_dts == AV_NOPTS_VALUE) { - ts_st->payload_dts = pkt->dts; - ts_st->payload_pts = pkt->pts; + ts_st->payload_dts = pkt->dts + delay; + ts_st->payload_pts = pkt->pts + delay; } if (ts_st->payload_index >= max_payload_size) { mpegts_write_pes(s, st, ts_st->payload, ts_st->payload_index, diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref index 412c652929..d97a52cc1a 100644 --- a/tests/libav.regression.ref +++ b/tests/libav.regression.ref @@ -9,7 +9,7 @@ c351132527ccb1e8cab06cc0822fde23 *./tests/data/b-libav.rm bdb7484c68db722f66ba1630cf79844c *./tests/data/b-libav.mpg 378880 ./tests/data/b-libav.mpg ./tests/data/b-libav.mpg CRC=0x2b71a386 -d1ab4041e32fb802bb164844d91cc5fe *./tests/data/b-libav.ts +9fd96456cbf2a550da816e563316d92f *./tests/data/b-libav.ts 471692 ./tests/data/b-libav.ts ./tests/data/b-libav.ts CRC=0xcc4948e1 1b28a16652bb8ac528b33f7478ca18b6 *./tests/data/b-libav.swf |