History

avformat/mxfdec: fix variable shadowing

Marvin Scholz committed 2 years ago

Commit f5107e71 parent dd002f11 file · +9 −9Browse files

Unified · Split

libavformat/mxfdec.c+9−9
@@ -871,16 +871,16 @@ static int mxf_read_partition_pack(void *arg, AVIOContext *pb, int tag, int size · 870 unmodified lines
871 * 2011_DCPTEST_24FPS.V.mxf - two ECs, OP1a871 * 2011_DCPTEST_24FPS.V.mxf - two ECs, OP1a
872 * abcdefghiv016f56415e.mxf - zero ECs, OPAtom, output by Avid AirSpeed */872 * abcdefghiv016f56415e.mxf - zero ECs, OPAtom, output by Avid AirSpeed */
873 if (nb_essence_containers != 1) {873 if (nb_essence_containers != 1) {
874 MXFOP op = nb_essence_containers ? OP1a : OPAtom;874 MXFOP mxfop = nb_essence_containers ? OP1a : OPAtom;
875 875
876 /* only nag once */876 /* only nag once */
877 if (!mxf->op)877 if (!mxf->op)
878 av_log(mxf->fc, AV_LOG_WARNING,878 av_log(mxf->fc, AV_LOG_WARNING,
879 "\"OPAtom\" with %"PRIu32" ECs - assuming %s\n",879 "\"OPAtom\" with %"PRIu32" ECs - assuming %s\n",
880 nb_essence_containers,880 nb_essence_containers,
881 op == OP1a ? "OP1a" : "OPAtom");881 mxfop == OP1a ? "OP1a" : "OPAtom");
882 882
883 mxf->op = op;883 mxf->op = mxfop;
884 } else884 } else
885 mxf->op = OPAtom;885 mxf->op = OPAtom;
886 } else {886 } else {
@@ -2574,7 +2574,7 @@ static int parse_mca_labels(MXFContext *mxf, MXFTrack *source_track, MXFDescript · 1687 unmodified lines
2574 }2574 }
2575 2575
2576 if (language && !ambigous_language) {2576 if (language && !ambigous_language) {
2577 int ret = set_language(mxf->fc, language, &st->metadata);2577 ret = set_language(mxf->fc, language, &st->metadata);
2578 if (ret < 0)2578 if (ret < 0)
2579 return ret;2579 return ret;
2580 }2580 }
@@ -2601,10 +2601,10 @@ static int parse_mca_labels(MXFContext *mxf, MXFTrack *source_track, MXFDescript · 20 unmodified lines
2601static int mxf_parse_structural_metadata(MXFContext *mxf)2601static int mxf_parse_structural_metadata(MXFContext *mxf)
2602{2602{
2603 MXFPackage *material_package = NULL;2603 MXFPackage *material_package = NULL;
2604 int i, j, k, ret;2604 int k, ret;
2605 2605
2606 /* TODO: handle multiple material packages (OP3x) */2606 /* TODO: handle multiple material packages (OP3x) */
2607 for (i = 0; i < mxf->packages_count; i++) {2607 for (int i = 0; i < mxf->packages_count; i++) {
2608 material_package = mxf_resolve_strong_ref(mxf, &mxf->packages_refs[i], MaterialPackage);2608 material_package = mxf_resolve_strong_ref(mxf, &mxf->packages_refs[i], MaterialPackage);
2609 if (material_package) break;2609 if (material_package) break;
2610 }2610 }
@@ -2618,7 +2618,7 @@ static int mxf_parse_structural_metadata(MXFContext *mxf) · 7 unmodified lines
2618 av_dict_set(&mxf->fc->metadata, "material_package_name", material_package->name, 0);2618 av_dict_set(&mxf->fc->metadata, "material_package_name", material_package->name, 0);
2619 mxf_parse_package_comments(mxf, &mxf->fc->metadata, material_package);2619 mxf_parse_package_comments(mxf, &mxf->fc->metadata, material_package);
2620 2620
2621 for (i = 0; i < material_package->tracks_count; i++) {2621 for (int i = 0; i < material_package->tracks_count; i++) {
2622 MXFPackage *source_package = NULL;2622 MXFPackage *source_package = NULL;
2623 MXFTrack *material_track = NULL;2623 MXFTrack *material_track = NULL;
2624 MXFTrack *source_track = NULL;2624 MXFTrack *source_track = NULL;
@@ -2653,7 +2653,7 @@ static int mxf_parse_structural_metadata(MXFContext *mxf) · 28 unmodified lines
2653 continue;2653 continue;
2654 }2654 }
2655 2655
2656 for (j = 0; j < material_track->sequence->structural_components_count; j++) {2656 for (int j = 0; j < material_track->sequence->structural_components_count; j++) {
2657 component = mxf_resolve_strong_ref(mxf, &material_track->sequence->structural_components_refs[j], TimecodeComponent);2657 component = mxf_resolve_strong_ref(mxf, &material_track->sequence->structural_components_refs[j], TimecodeComponent);
2658 if (!component)2658 if (!component)
2659 continue;2659 continue;
@@ -2671,7 +2671,7 @@ static int mxf_parse_structural_metadata(MXFContext *mxf) · 11 unmodified lines
2671 av_log(mxf->fc, AV_LOG_WARNING, "material track %d: has %d components\n",2671 av_log(mxf->fc, AV_LOG_WARNING, "material track %d: has %d components\n",
2672 material_track->track_id, material_track->sequence->structural_components_count);2672 material_track->track_id, material_track->sequence->structural_components_count);
2673 2673
2674 for (j = 0; j < material_track->sequence->structural_components_count; j++) {2674 for (int j = 0; j < material_track->sequence->structural_components_count; j++) {
2675 component = mxf_resolve_sourceclip(mxf, &material_track->sequence->structural_components_refs[j]);2675 component = mxf_resolve_sourceclip(mxf, &material_track->sequence->structural_components_refs[j]);
2676 if (!component)2676 if (!component)
2677 continue;2677 continue;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t