diff options
| author | Maksym Veremeyenko <verem@m1.tv> | 2021-11-03 12:57:45 +0200 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2021-11-06 20:35:19 +0100 |
| commit | a085418303a2e736181919429e9b43c06e916f69 (patch) | |
| tree | 2019e387cdb548edb7f47419a4cba4708e815809 /libavformat/mpegtsenc.c | |
| parent | 9d4989f2e17c11d4ee9daa489b6e4f5195d80b99 (diff) | |
avformat/mpegtsenc: fix first_pcr initial update
Commit 6f36eb0da71d22aadf8f056f0966bd86656ea57e claim it fixes endless loop on
package generation if muxrate specified and copyts used. But actually it does
not work properly if -mpegts_copyts 1 is specified:
ffmpeg -y -copyts -i loewe.ts -c:v libx264 -x264opts nal-hrd=cbr:force-cfr=1 -b:v 3500k -minrate 3500k -maxrate 3500k -bufsize 1000k -c:a mp2 -f mpegts -mpegts_copyts 1 -muxrate 4500k -vframes 1000 test.ts
ffmpeg generate huge file until it reach zero-based pcr value equal to first dts.
Attached patch fixes it.
Reviewed-by: Limin Wang <lance.lmwang@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavformat/mpegtsenc.c')
| -rw-r--r-- | libavformat/mpegtsenc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 184bb52f75..fe2e742c15 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -1852,12 +1852,12 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt) if (side_data) stream_id = side_data[0]; - if (ts->copyts < 1) { - if (!ts->first_dts_checked && dts != AV_NOPTS_VALUE) { - ts->first_pcr += dts * 300; - ts->first_dts_checked = 1; - } + if (!ts->first_dts_checked && dts != AV_NOPTS_VALUE) { + ts->first_pcr += dts * 300; + ts->first_dts_checked = 1; + } + if (ts->copyts < 1) { if (pts != AV_NOPTS_VALUE) pts += delay; if (dts != AV_NOPTS_VALUE) |