[FFmpeg-cvslog] lavf/segment: consistently use "seg" in segment_start()

Stefano Sabatini git at videolan.org
Tue Nov 20 22:56:36 CET 2012


ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Sat Nov 17 16:35:51 2012 +0100| [b6c05879eaead551fe5bfd0dc8e1d4eef7d4179f] | committer: Stefano Sabatini

lavf/segment: consistently use "seg" in segment_start()

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

 libavformat/segment.c |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/libavformat/segment.c b/libavformat/segment.c
index 339f968..c3681d4 100644
--- a/libavformat/segment.c
+++ b/libavformat/segment.c
@@ -130,27 +130,27 @@ static int segment_mux_init(AVFormatContext *s)
 
 static int segment_start(AVFormatContext *s, int write_header)
 {
-    SegmentContext *c = s->priv_data;
-    AVFormatContext *oc = c->avf;
+    SegmentContext *seg = s->priv_data;
+    AVFormatContext *oc = seg->avf;
     int err = 0;
 
     if (write_header) {
         avformat_free_context(oc);
-        c->avf = NULL;
+        seg->avf = NULL;
         if ((err = segment_mux_init(s)) < 0)
             return err;
-        oc = c->avf;
+        oc = seg->avf;
     }
 
-    if (c->segment_idx_wrap)
-        c->segment_idx %= c->segment_idx_wrap;
+    if (seg->segment_idx_wrap)
+        seg->segment_idx %= seg->segment_idx_wrap;
 
     if (av_get_frame_filename(oc->filename, sizeof(oc->filename),
-                              s->filename, c->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);
     }
-    c->segment_count++;
+    seg->segment_count++;
 
     if ((err = avio_open2(&oc->pb, oc->filename, AVIO_FLAG_WRITE,
                           &s->interrupt_callback, NULL)) < 0)



More information about the ffmpeg-cvslog mailing list