Improve get_next_track_with_minimum_timestamp()

Move tmp var into block

Author: palemieux

libavformat/imf_cpl.c

@@ -313,7 +313,6 @@ static int fill_marker_resource(xmlNodePtr marker_resource_elem,
     FFIMFCPL *cpl)
 {
     xmlNodePtr element = NULL;
-    void *tmp;
     int ret = 0;
 
     if (ret = fill_base_resource(marker_resource_elem, (FFIMFBaseResource *)marker_resource, cpl))
@@ -323,6 +322,8 @@ static int fill_marker_resource(xmlNodePtr marker_resource_elem,
     element = xmlFirstElementChild(marker_resource_elem);
     while (element) {
         if (xmlStrcmp(element->name, "Marker") == 0) {
+            void *tmp;
+
             tmp = av_realloc_array(marker_resource->markers,
                 marker_resource->marker_count + 1,
                 sizeof(FFIMFMarker));

libavformat/imfdec.c

@@ -642,7 +642,7 @@ static IMFVirtualTrackPlaybackCtx *get_next_track_with_minimum_timestamp(AVForma
     IMFVirtualTrackPlaybackCtx *track;
 
     AVRational minimum_timestamp = av_make_q(INT32_MAX, 1);
-    for (uint32_t i = 0; i < c->track_count; ++i) {
+    for (uint32_t i = c->track_count; i > 0; i--) {
         av_log(
             s,
             AV_LOG_DEBUG,
@@ -651,11 +651,12 @@ static IMFVirtualTrackPlaybackCtx *get_next_track_with_minimum_timestamp(AVForma
             " (over duration: " AVRATIONAL_FORMAT
             ")\n",
             i,
-            AVRATIONAL_ARG(c->tracks[i]->current_timestamp),
+            AVRATIONAL_ARG(c->tracks[i - 1]->current_timestamp),
             AVRATIONAL_ARG(minimum_timestamp),
-            AVRATIONAL_ARG(c->tracks[i]->duration));
-        if (av_cmp_q(c->tracks[i]->current_timestamp, minimum_timestamp) < 0) {
-            track = c->tracks[i];
+            AVRATIONAL_ARG(c->tracks[i - 1]->duration));
+
+        if (av_cmp_q(c->tracks[i - 1]->current_timestamp, minimum_timestamp) <= 0) {
+            track = c->tracks[i - 1];
             minimum_timestamp = track->current_timestamp;
         }
     }