lavf/segment: do not pre-increment segment_idx value
authorStefano Sabatini <stefasab@gmail.com>
Sat, 17 Nov 2012 16:20:29 +0000 (17:20 +0100)
committerStefano Sabatini <stefasab@gmail.com>
Tue, 20 Nov 2012 21:48:28 +0000 (22:48 +0100)
Increment the value just when a new segment with the given index is
started. Simplify logic, improve readability.

libavformat/segment.c

index 0dd9faf..c494bbf 100644 (file)
@@ -142,11 +142,12 @@ static int segment_start(AVFormatContext *s, int write_header)
         oc = seg->avf;
     }
 
+    seg->segment_idx++;
     if (seg->segment_idx_wrap)
         seg->segment_idx %= seg->segment_idx_wrap;
 
     if (av_get_frame_filename(oc->filename, sizeof(oc->filename),
-                              s->filename, seg->segment_idx++) < 0) {
+                              s->filename, seg->segment_idx) < 0) {
         av_log(oc, AV_LOG_ERROR, "Invalid segment filename template '%s'\n", s->filename);
         return AVERROR(EINVAL);
     }
@@ -407,7 +408,7 @@ static int seg_write_header(AVFormatContext *s)
     oc = seg->avf;
 
     if (av_get_frame_filename(oc->filename, sizeof(oc->filename),
-                              s->filename, seg->segment_idx++) < 0) {
+                              s->filename, seg->segment_idx) < 0) {
         ret = AVERROR(EINVAL);
         goto fail;
     }