Mercurial > libavformat.hg
comparison 4xm.c @ 4299:59c385f94310 libavformat
Move current_track variable closer to where it is used.
author | michael |
---|---|
date | Tue, 27 Jan 2009 21:58:45 +0000 |
parents | dad1519b0829 |
children | 13e68e70e129 |
comparison
equal
deleted
inserted
replaced
4298:dad1519b0829 | 4299:59c385f94310 |
---|---|
98 unsigned int size; | 98 unsigned int size; |
99 int header_size; | 99 int header_size; |
100 FourxmDemuxContext *fourxm = s->priv_data; | 100 FourxmDemuxContext *fourxm = s->priv_data; |
101 unsigned char *header; | 101 unsigned char *header; |
102 int i, ret; | 102 int i, ret; |
103 int current_track = -1; | |
104 AVStream *st; | 103 AVStream *st; |
105 | 104 |
106 fourxm->track_count = 0; | 105 fourxm->track_count = 0; |
107 fourxm->tracks = NULL; | 106 fourxm->tracks = NULL; |
108 fourxm->selected_track = 0; | 107 fourxm->selected_track = 0; |
160 st->codec->width = fourxm->width; | 159 st->codec->width = fourxm->width; |
161 st->codec->height = fourxm->height; | 160 st->codec->height = fourxm->height; |
162 | 161 |
163 i += 8 + size; | 162 i += 8 + size; |
164 } else if (fourcc_tag == strk_TAG) { | 163 } else if (fourcc_tag == strk_TAG) { |
164 int current_track; | |
165 /* check that there is enough data */ | 165 /* check that there is enough data */ |
166 if (size != strk_SIZE) { | 166 if (size != strk_SIZE) { |
167 ret= AVERROR_INVALIDDATA; | 167 ret= AVERROR_INVALIDDATA; |
168 goto fail; | 168 goto fail; |
169 } | 169 } |