Commit 45426150 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'e73d26bb'

* commit 'e73d26bb':
  smoothstreamingenc: explict cast to avoid overflow

Conflicts:
	libavformat/smoothstreamingenc.c

See: b399816dMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 2f74b8d0 e73d26bb
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment