Merge commit '7266e24f176389d2e81bfc7c829934f7c8ae361c'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Apr 2014 19:29:04 +0000 (21:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Apr 2014 19:29:04 +0000 (21:29 +0200)
* commit '7266e24f176389d2e81bfc7c829934f7c8ae361c':
  hls: Sync the file number with the start sequence

Conflicts:
libavformat/hlsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/hlsenc.c

@@@ -174,10 -173,8 +174,10 @@@ static int hls_start(AVFormatContext *s
      int err = 0;
  
      if (av_get_frame_filename(oc->filename, sizeof(oc->filename),
-                               c->basename, c->wrap ? c->number % c->wrap : c->number) < 0) {
 -                              c->basename, c->wrap ? c->sequence % c->wrap : c->sequence) < 0)
++                              c->basename, c->wrap ? c->sequence % c->wrap : c->sequence) < 0) {
 +        av_log(oc, AV_LOG_ERROR, "Invalid segment filename template '%s'\n", c->basename);
          return AVERROR(EINVAL);
 +    }
      c->number++;
  
      if ((err = avio_open2(&oc->pb, oc->filename, AVIO_FLAG_WRITE,