diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-21 22:00:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-21 22:00:04 +0200 |
| commit | 4542615063fbb100864fa499aca8cf4e36a38231 (patch) | |
| tree | 6703c0e31d0b574a7ab0a067bc1a462cc55c9554 | |
| parent | 2f74b8d0edbe20a12f30385b4354bf5cbb48c80e (diff) | |
| parent | e73d26bbd65f1ac5fc73ef3fd24cab1bed8ba2e2 (diff) | |
| download | ffmpeg-4542615063fbb100864fa499aca8cf4e36a38231.tar.gz | |
Merge commit 'e73d26bbd65f1ac5fc73ef3fd24cab1bed8ba2e2'
* commit 'e73d26bbd65f1ac5fc73ef3fd24cab1bed8ba2e2':
smoothstreamingenc: explict cast to avoid overflow
Conflicts:
libavformat/smoothstreamingenc.c
See: b399816d9c3d0fc3efd742b04f269c1055cc6e2b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/smoothstreamingenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/smoothstreamingenc.c b/libavformat/smoothstreamingenc.c index 9f6d38fe3f..7fbb2b7d7f 100644 --- a/libavformat/smoothstreamingenc.c +++ b/libavformat/smoothstreamingenc.c @@ -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) |