mirror of https://git.ffmpeg.org/ffmpeg.git
avformat/movenc: Check that cts fits in 32bit
Fixes: Assertion av_rescale_rnd(start_dts, mov->movie_timescale, track->timescale, AV_ROUND_DOWN) <= 0 failed at libavformat/movenc.c:3694
Fixes: poc2
Found-by: Wang Dawei and Zhou Geng, from Zhongguancun Laboratory
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit d88c284c18
)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
9f31c87487
commit
642e31ad89
|
@ -5272,6 +5272,12 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
|
|||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
if (pkt->pts != AV_NOPTS_VALUE &&
|
||||
(uint64_t)pkt->dts - pkt->pts != (int32_t)((uint64_t)pkt->dts - pkt->pts)) {
|
||||
av_log(s, AV_LOG_WARNING, "pts/dts pair unsupported\n");
|
||||
return AVERROR_PATCHWELCOME;
|
||||
}
|
||||
|
||||
if (mov->flags & FF_MOV_FLAG_FRAGMENT) {
|
||||
int ret;
|
||||
if (mov->moov_written || mov->flags & FF_MOV_FLAG_EMPTY_MOOV) {
|
||||
|
|
Loading…
Reference in New Issue