Unified · Split
| @@ -482,9 +482,7 @@ static int klv_read_packet(MXFContext *mxf, KLVPacket *klv, AVIOContext *pb) · 481 unmodified lines | ||
| 482 | 482 | |
| 483 | 483 | static int mxf_get_stream_index(AVFormatContext *s, KLVPacket *klv, int body_sid) |
| 484 | 484 | { |
| 485 | − int i; | |
| 486 | − | |
| 487 | − for (i = 0; i < s->nb_streams; i++) { | |
| 485 | + for (int i = 0; i < s->nb_streams; i++) { | |
| 488 | 486 | MXFTrack *track = s->streams[i]->priv_data; |
| 489 | 487 | /* SMPTE 379M 7.3 */ |
| 490 | 488 | if (track && (!body_sid || !track->body_sid || track->body_sid == body_sid) && !memcmp(klv->key + sizeof(mxf_essence_element_key), track->track_number, sizeof(track->track_number))) |
| @@ -523,12 +521,12 @@ static int mxf_get_eia608_packet(AVFormatContext *s, AVStream *st, AVPacket *pkt · 32 unmodified lines | ||
| 523 | 521 | int cdp_identifier, cdp_length, cdp_footer_id, ccdata_id, cc_count; |
| 524 | 522 | int line_num, sample_coding, sample_count; |
| 525 | 523 | int did, sdid, data_length; |
| 526 | − int i, ret; | |
| 524 | + int ret; | |
| 527 | 525 | |
| 528 | 526 | if (count > 1) |
| 529 | 527 | av_log(s, AV_LOG_WARNING, "unsupported multiple ANC packets (%d) per KLV packet\n", count); |
| 530 | 528 | |
| 531 | − for (i = 0; i < count; i++) { | |
| 529 | + for (int i = 0; i < count; i++) { | |
| 532 | 530 | if (length < 6) { |
| 533 | 531 | av_log(s, AV_LOG_ERROR, "error reading s436m packet %"PRId64"\n", length); |
| 534 | 532 | return AVERROR_INVALIDDATA; |
| @@ -597,7 +595,6 @@ static int mxf_get_d10_aes3_packet(AVIOContext *pb, AVStream *st, AVPacket *pkt, · 62 unmodified lines | ||
| 597 | 595 | { |
| 598 | 596 | const uint8_t *buf_ptr, *end_ptr; |
| 599 | 597 | uint8_t *data_ptr; |
| 600 | − int i; | |
| 601 | 598 | |
| 602 | 599 | if (length > 61444) /* worst case PAL 1920 samples 8 channels */ |
| 603 | 600 | return AVERROR_INVALIDDATA; |
| @@ -612,7 +609,7 @@ static int mxf_get_d10_aes3_packet(AVIOContext *pb, AVStream *st, AVPacket *pkt, · 8 unmodified lines | ||
| 612 | 609 | return AVERROR_INVALIDDATA; |
| 613 | 610 | |
| 614 | 611 | for (; end_ptr - buf_ptr >= st->codecpar->ch_layout.nb_channels * 4; ) { |
| 615 | − for (i = 0; i < st->codecpar->ch_layout.nb_channels; i++) { | |
| 612 | + for (int i = 0; i < st->codecpar->ch_layout.nb_channels; i++) { | |
| 616 | 613 | uint32_t sample = bytestream_get_le32(&buf_ptr); |
| 617 | 614 | if (st->codecpar->bits_per_coded_sample == 24) |
| 618 | 615 | bytestream_put_le24(&data_ptr, (sample >> 4) & 0xffffff); |
| @@ -2068,7 +2065,7 @@ static int mxf_compute_ptses_fake_index(MXFContext *mxf, MXFIndexTable *index_ta · 1449 unmodified lines | ||
| 2068 | 2065 | */ |
| 2069 | 2066 | static int mxf_compute_index_tables(MXFContext *mxf) |
| 2070 | 2067 | { |
| 2071 | − int i, j, k, ret, nb_sorted_segments; | |
| 2068 | + int ret, nb_sorted_segments; | |
| 2072 | 2069 | MXFIndexTableSegment **sorted_segments = NULL; |
| 2073 | 2070 | |
| 2074 | 2071 | if ((ret = mxf_get_sorted_table_segments(mxf, &nb_sorted_segments, &sorted_segments)) || |
| @@ -2078,7 +2075,7 @@ static int mxf_compute_index_tables(MXFContext *mxf) · 3 unmodified lines | ||
| 2078 | 2075 | } |
| 2079 | 2076 | |
| 2080 | 2077 | /* sanity check and count unique BodySIDs/IndexSIDs */ |
| 2081 | − for (i = 0; i < nb_sorted_segments; i++) { | |
| 2078 | + for (int i = 0; i < nb_sorted_segments; i++) { | |
| 2082 | 2079 | if (i == 0 || sorted_segments[i-1]->index_sid != sorted_segments[i]->index_sid) |
| 2083 | 2080 | mxf->nb_index_tables++; |
| 2084 | 2081 | else if (sorted_segments[i-1]->body_sid != sorted_segments[i]->body_sid) { |
| @@ -2097,7 +2094,7 @@ static int mxf_compute_index_tables(MXFContext *mxf) · 12 unmodified lines | ||
| 2097 | 2094 | } |
| 2098 | 2095 | |
| 2099 | 2096 | /* distribute sorted segments to index tables */ |
| 2100 | − for (i = j = 0; i < nb_sorted_segments; i++) { | |
| 2097 | + for (int i = 0, j = 0; i < nb_sorted_segments; i++) { | |
| 2101 | 2098 | if (i != 0 && sorted_segments[i-1]->index_sid != sorted_segments[i]->index_sid) { |
| 2102 | 2099 | /* next IndexSID */ |
| 2103 | 2100 | j++; |
| @@ -2106,7 +2103,7 @@ static int mxf_compute_index_tables(MXFContext *mxf) · 2 unmodified lines | ||
| 2106 | 2103 | mxf->index_tables[j].nb_segments++; |
| 2107 | 2104 | } |
| 2108 | 2105 | |
| 2109 | − for (i = j = 0; j < mxf->nb_index_tables; i += mxf->index_tables[j++].nb_segments) { | |
| 2106 | + for (int i = 0, j = 0; j < mxf->nb_index_tables; i += mxf->index_tables[j++].nb_segments) { | |
| 2110 | 2107 | MXFIndexTable *t = &mxf->index_tables[j]; |
| 2111 | 2108 | MXFTrack *mxf_track = NULL; |
| 2112 | 2109 | |
| @@ -2129,7 +2126,7 @@ static int mxf_compute_index_tables(MXFContext *mxf) · 16 unmodified lines | ||
| 2129 | 2126 | if ((ret = mxf_compute_ptses_fake_index(mxf, t)) < 0) |
| 2130 | 2127 | goto finish_decoding_index; |
| 2131 | 2128 | |
| 2132 | − for (k = 0; k < mxf->fc->nb_streams; k++) { | |
| 2129 | + for (int k = 0; k < mxf->fc->nb_streams; k++) { | |
| 2133 | 2130 | MXFTrack *track = mxf->fc->streams[k]->priv_data; |
| 2134 | 2131 | if (track && track->index_sid == t->index_sid) { |
| 2135 | 2132 | mxf_track = track; |
| @@ -2138,7 +2135,7 @@ static int mxf_compute_index_tables(MXFContext *mxf) · 2 unmodified lines | ||
| 2138 | 2135 | } |
| 2139 | 2136 | |
| 2140 | 2137 | /* fix zero IndexDurations */ |
| 2141 | − for (k = 0; k < t->nb_segments; k++) { | |
| 2138 | + for (int k = 0; k < t->nb_segments; k++) { | |
| 2142 | 2139 | if (!t->segments[k]->index_edit_rate.num || !t->segments[k]->index_edit_rate.den) { |
| 2143 | 2140 | av_log(mxf->fc, AV_LOG_WARNING, "IndexSID %i segment %i has invalid IndexEditRate\n", |
| 2144 | 2141 | t->index_sid, k); |
| @@ -4087,17 +4084,16 @@ static int mxf_read_packet(AVFormatContext *s, AVPacket *pkt) · 1942 unmodified lines | ||
| 4087 | 4084 | static int mxf_read_close(AVFormatContext *s) |
| 4088 | 4085 | { |
| 4089 | 4086 | MXFContext *mxf = s->priv_data; |
| 4090 | − int i; | |
| 4091 | 4087 | |
| 4092 | 4088 | av_freep(&mxf->packages_refs); |
| 4093 | 4089 | av_freep(&mxf->essence_container_data_refs); |
| 4094 | 4090 | |
| 4095 | − for (i = 0; i < s->nb_streams; i++) | |
| 4091 | + for (int i = 0; i < s->nb_streams; i++) | |
| 4096 | 4092 | s->streams[i]->priv_data = NULL; |
| 4097 | 4093 | |
| 4098 | 4094 | for (int type = 0; type < FF_ARRAY_ELEMS(mxf->metadata_set_groups); type++) { |
| 4099 | 4095 | MXFMetadataSetGroup *mg = &mxf->metadata_set_groups[type]; |
| 4100 | − for (i = 0; i < mg->metadata_sets_count; i++) | |
| 4096 | + for (int i = 0; i < mg->metadata_sets_count; i++) | |
| 4101 | 4097 | mxf_free_metadataset(mg->metadata_sets + i, type); |
| 4102 | 4098 | mg->metadata_sets_count = 0; |
| 4103 | 4099 | av_freep(&mg->metadata_sets); |
| @@ -4107,7 +4103,7 @@ static int mxf_read_close(AVFormatContext *s) · 3 unmodified lines | ||
| 4107 | 4103 | av_freep(&mxf->local_tags); |
| 4108 | 4104 | |
| 4109 | 4105 | if (mxf->index_tables) { |
| 4110 | − for (i = 0; i < mxf->nb_index_tables; i++) { | |
| 4106 | + for (int i = 0; i < mxf->nb_index_tables; i++) { | |
| 4111 | 4107 | av_freep(&mxf->index_tables[i].segments); |
| 4112 | 4108 | av_freep(&mxf->index_tables[i].ptses); |
| 4113 | 4109 | av_freep(&mxf->index_tables[i].fake_index); |
| @@ -4152,7 +4148,7 @@ static int mxf_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti · 38 unmodified lines | ||
| 4152 | 4148 | int64_t seconds; |
| 4153 | 4149 | MXFContext* mxf = s->priv_data; |
| 4154 | 4150 | int64_t seekpos; |
| 4155 | − int i, ret; | |
| 4151 | + int ret; | |
| 4156 | 4152 | MXFIndexTable *t; |
| 4157 | 4153 | MXFTrack *source_track = st->priv_data; |
| 4158 | 4154 | |
| @@ -4182,6 +4178,7 @@ static int mxf_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti · 23 unmodified lines | ||
| 4182 | 4178 | |
| 4183 | 4179 | t = &mxf->index_tables[0]; |
| 4184 | 4180 | if (t->index_sid != source_track->index_sid) { |
| 4181 | + int i; | |
| 4185 | 4182 | /* If the first index table does not belong to the stream, then find a stream which does belong to the index table */ |
| 4186 | 4183 | for (i = 0; i < s->nb_streams; i++) { |
| 4187 | 4184 | MXFTrack *new_source_track = s->streams[i]->priv_data; |
| @@ -4243,7 +4240,7 @@ static int mxf_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti · 55 unmodified lines | ||
| 4243 | 4240 | } |
| 4244 | 4241 | |
| 4245 | 4242 | // Update all tracks sample count |
| 4246 | − for (i = 0; i < s->nb_streams; i++) { | |
| 4243 | + for (int i = 0; i < s->nb_streams; i++) { | |
| 4247 | 4244 | AVStream *cur_st = s->streams[i]; |
| 4248 | 4245 | MXFTrack *cur_track = cur_st->priv_data; |
| 4249 | 4246 | if (cur_track) { |