[SCM] libav/experimental: Move current_track variable closer to where it is used.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:36:17 UTC 2013


The following commit has been merged in the experimental branch:
commit a10f1cbb934cd607643b08f43067233ae7620e75
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Tue Jan 27 21:58:45 2009 +0000

    Move current_track variable closer to where it is used.
    
    Originally committed as revision 16834 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/4xm.c b/libavformat/4xm.c
index 8d2fbe3..43aa64a 100644
--- a/libavformat/4xm.c
+++ b/libavformat/4xm.c
@@ -100,7 +100,6 @@ static int fourxm_read_header(AVFormatContext *s,
     FourxmDemuxContext *fourxm = s->priv_data;
     unsigned char *header;
     int i, ret;
-    int current_track = -1;
     AVStream *st;
 
     fourxm->track_count = 0;
@@ -162,6 +161,7 @@ static int fourxm_read_header(AVFormatContext *s,
 
             i += 8 + size;
         } else if (fourcc_tag == strk_TAG) {
+            int current_track;
             /* check that there is enough data */
             if (size != strk_SIZE) {
                 ret= AVERROR_INVALIDDATA;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list