diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-14 22:15:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-14 22:17:17 +0100 |
| commit | 6659364d3a4778b37421e35c10d9205343f0fa8d (patch) | |
| tree | 41fd955f6d2c6b6dee7ce660313b8f6dd9d923c4 /libavformat/hdsenc.c | |
| parent | f357ef2e0ce189955f1a7681ae658432efeb17b3 (diff) | |
| parent | 797f2a791397210ec1b591b326658805c5dbf104 (diff) | |
| download | ffmpeg-6659364d3a4778b37421e35c10d9205343f0fa8d.tar.gz | |
Merge commit '797f2a791397210ec1b591b326658805c5dbf104'
* commit '797f2a791397210ec1b591b326658805c5dbf104':
hdsenc: Check the init_file() return code
hdsenc: Fix an off by one error in an array size check
hdsenc: Avoid integer overflow
Conflicts:
libavformat/hdsenc.c
See: 572965c9a6b8173d918dea392aadfee1d44d7f47
See: 3dbf9afe857d480993786bea0ede9dd9526776d2
See: 6722e564a82bac471d92b02550b5017c09b539ba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/hdsenc.c')
| -rw-r--r-- | libavformat/hdsenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/hdsenc.c b/libavformat/hdsenc.c index 1a3814d7e3..f22875d0cc 100644 --- a/libavformat/hdsenc.c +++ b/libavformat/hdsenc.c @@ -520,7 +520,7 @@ static int hds_write_packet(AVFormatContext *s, AVPacket *pkt) HDSContext *c = s->priv_data; AVStream *st = s->streams[pkt->stream_index]; OutputStream *os = &c->streams[s->streams[pkt->stream_index]->id]; - int64_t end_dts = (os->fragment_index) * (int64_t)c->min_frag_duration; + int64_t end_dts = os->fragment_index * (int64_t)c->min_frag_duration; int ret; if (st->first_dts == AV_NOPTS_VALUE) |