Changeset 1021

Timestamp:

01/22/09 23:03:29 (1 year ago)

Author:

dconrad

Message:

FFmpeg used to write a TrackDefault? flag of 0 for mkv, disabling all tracks. Thus, ensure a track is enabled in this case.

Files:

• trunk/MatroskaImportPrivate.cpp (modified) (1 diff)

trunk/MatroskaImportPrivate.cpp

@@ -356 +356 @@
-                SetTrackEnabled(tracks[i].theTrack, tracks[i].isEnabled);
-        }
+        // ensure that at least one track in each alternate group (type) is enabled
+        // ffmpeg used to write a TrackDefault of 0 for all tracks
+        for (int i = 0; i < tracks.size(); i++) {
+                if (!GetTrackEnabled(tracks[i].theTrack)) {
+                        Track alternate = GetTrackAlternate(tracks[i].theTrack);
+                        while (alternate != tracks[i].theTrack && !GetTrackEnabled(alternate))
+                                alternate = GetTrackAlternate(alternate);
+                        if (alternate == tracks[i].theTrack)
+                                SetTrackEnabled(tracks[i].theTrack, 1);
+                }
+        }
-        seenTracks = true;
-        return noErr;