Be slightly more backwards compatible.
authorCarl Hetherington <cth@carlh.net>
Wed, 14 Nov 2012 22:08:17 +0000 (22:08 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 14 Nov 2012 22:08:17 +0000 (22:08 +0000)
src/lib/film.cc

index ac5b43a987d8a61399e9b09ad4184040b755ec28..f45a924472a3f054746b91e59a76b77696d83fdd 100644 (file)
@@ -515,7 +515,11 @@ Film::read_metadata ()
                } else if (k == "use_content_audio") {
                        _use_content_audio = (v == "1");
                } else if (k == "selected_audio_stream") {
-                       _audio_stream = AudioStream (v);
+                       AudioStream st (v);
+                       /* check for -1 for backwards compatibility */
+                       if (st.id() != -1) {
+                               _audio_stream = AudioStream (v);
+                       }
                } else if (k == "external_audio") {
                        _external_audio.push_back (v);
                } else if (k == "audio_gain") {
@@ -525,7 +529,11 @@ Film::read_metadata ()
                } else if (k == "still_duration") {
                        _still_duration = atoi (v.c_str ());
                } else if (k == "selected_subtitle_stream") {
-                       _subtitle_stream = SubtitleStream (v);
+                       SubtitleStream st (v);
+                       /* check for -1 for backwards compatibility */
+                       if (st.id() != -1) {
+                               _subtitle_stream = st;
+                       }
                } else if (k == "with_subtitles") {
                        _with_subtitles = (v == "1");
                } else if (k == "subtitle_offset") {