diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-02-05 09:59:53 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-02-05 09:59:53 +0000 |
| commit | 8f12ef26c5f6c0e9f408828b99ff8bdc90236406 (patch) | |
| tree | 0ed0c1be345487584400a47533fd8bf8fc6467cc /src/lib | |
| parent | 9d8ef746e91d284979e382137c0d538e02f254b3 (diff) | |
| parent | de0652ba4f4804bf0d0aeaedb5bda5ae21c1e247 (diff) | |
Merge.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/ffmpeg_content.cc | 8 | ||||
| -rw-r--r-- | src/lib/po/de_DE.po | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index ba799be72..b47116bdc 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -131,10 +131,18 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> film, vector<boost::shared_ } } + /* XXX: should probably check that more of the stuff below is the same in *this and ref */ + _subtitle_streams = ref->subtitle_streams (); _subtitle_stream = ref->subtitle_stream (); _audio_streams = ref->ffmpeg_audio_streams (); _first_video = ref->_first_video; + _filters = ref->_filters; + _color_range = ref->_color_range; + _color_primaries = ref->_color_primaries; + _color_trc = ref->_color_trc; + _colorspace = ref->_colorspace; + _bits_per_pixel = ref->_bits_per_pixel; } void diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po index bf6f7b4c3..c71373340 100644 --- a/src/lib/po/de_DE.po +++ b/src/lib/po/de_DE.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-01-10 02:45+0000\n" -"PO-Revision-Date: 2016-01-29 03:45+0100\n" +"PO-Revision-Date: 2016-02-03 23:42+0100\n" "Last-Translator: Carsten Kurz\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: de\n" @@ -157,7 +157,7 @@ msgstr "Überprüfe bestehende Bilddateien" #: src/lib/ffmpeg_content.cc:427 msgid "Colour primaries" -msgstr "Grundfarbezug ('primaries')" +msgstr "Grundfarbbezug ('primaries')" #. / TRANSLATORS: this means that the range of pixel values used in this #. / file is unknown (not specified in the file). @@ -684,7 +684,7 @@ msgstr "" #: src/lib/job.cc:145 msgid "Out of memory" -msgstr "Zuwenig Speicher" +msgstr "Zu wenig Speicher" #: src/lib/filter.cc:73 msgid "Overcomplete wavelet denoiser" @@ -740,7 +740,7 @@ msgid "" "to 'split by video content'." msgstr "" "Aktlängen im Projekt unterscheiden sich von DCP; Aktunterteilung wurde auf " -"Inhaltssegmentgrenzen gesetzt" +"Inhalts-Segmentgrenzen gesetzt" #: src/lib/mid_side_decoder.cc:98 src/lib/util.cc:484 msgid "Right" |