mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-08-20 00:05:06 +02:00
Merge commit 'e73d26bbd65f1ac5fc73ef3fd24cab1bed8ba2e2'
* commit 'e73d26bbd65f1ac5fc73ef3fd24cab1bed8ba2e2':
smoothstreamingenc: explict cast to avoid overflow
Conflicts:
libavformat/smoothstreamingenc.c
See: b399816d9c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
4542615063
@ -576,7 +576,7 @@ static int ism_write_packet(AVFormatContext *s, AVPacket *pkt)
|
||||
SmoothStreamingContext *c = s->priv_data;
|
||||
AVStream *st = s->streams[pkt->stream_index];
|
||||
OutputStream *os = &c->streams[pkt->stream_index];
|
||||
int64_t end_dts = (c->nb_fragments + 1LL) * c->min_frag_duration;
|
||||
int64_t end_dts = (c->nb_fragments + 1) * (int64_t) c->min_frag_duration;
|
||||
int ret;
|
||||
|
||||
if (st->first_dts == AV_NOPTS_VALUE)
|
||||
|
Loading…
Reference in New Issue
Block a user