diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-11-14 22:08:17 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-11-14 22:08:17 +0000 |
| commit | 65e7ad9b9512816a3313db7e817ed2466d84d644 (patch) | |
| tree | eab88b17f504b5eaf099e6498ba75d5d3427910c /src/lib | |
| parent | 161c49e0ca4462092c85ebb5b5ea25483f74e78c (diff) | |
Be slightly more backwards compatible.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/film.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index ac5b43a98..f45a92447 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -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") { |