Commit 6659364d authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '797f2a79'

* commit '797f2a79':
  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: 572965c9
See: 3dbf9afe
See: 6722e564Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents f357ef2e 797f2a79
......@@ -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)
......
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