[FFmpeg-cvslog] lavf/hlsenc: fix bogus hls segment index rewrapping logic

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Thu Jun  6 12:09:38 2013 +0200| [75b9fb27f516f9db7995ab2c2abb83e25cae5813] | committer: Carl Eugen Hoyos

lavf/hlsenc: fix bogus hls segment index rewrapping logic

The counter should not be reset since it detects the
hls segment increasing timeframe.

Fixes ticket #2643.

Reviewed-by: Stefano Sabatini

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=75b9fb27f516f9db7995ab2c2abb83e25cae5813
---

 libavformat/hlsenc.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index e97b4e0..af04d09 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -164,14 +164,12 @@ static int hls_start(AVFormatContext *s)
     AVFormatContext *oc = c->avf;
     int err = 0;
 
-    if (c->wrap)
-        c->number %= c->wrap;
-
     if (av_get_frame_filename(oc->filename, sizeof(oc->filename),
-                              c->basename, c->number++) < 0) {
+                              c->basename, c->wrap ? c->number % c->wrap : c->number) < 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,
                           &s->interrupt_callback, NULL)) < 0)