OSDN Git Service

Merge commit '797f2a791397210ec1b591b326658805c5dbf104'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Dec 2013 21:15:10 +0000 (22:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Dec 2013 21:17:17 +0000 (22:17 +0100)
* 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>
1  2 
libavformat/hdsenc.c

@@@ -520,7 -511,7 +520,7 @@@ static int hds_write_packet(AVFormatCon
      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;
++    int64_t end_dts = os->fragment_index * (int64_t)c->min_frag_duration;
      int ret;
  
      if (st->first_dts == AV_NOPTS_VALUE)