Merge.

[dcpomatic.git] / src / lib / tiff_decoder.cc

diff --git a/src/lib/tiff_decoder.cc b/src/lib/tiff_decoder.cc
index 6738de49b3e062765146b93ceb042d79d62d5505..101e0c047ee69cd575827fa8e856e71d33a86086 100644 (file)
--- a/src/lib/tiff_decoder.cc
+++ b/src/lib/tiff_decoder.cc
@@ -130,6 +130,13 @@ TIFFDecoder::audio_sample_format () const
        return AV_SAMPLE_FMT_NONE;
 }
 
+
+int64_t
+TIFFDecoder::audio_channel_layout () const
+{
+       return 0;
+}
+
 bool
 TIFFDecoder::do_pass ()
 {
@@ -221,4 +228,3 @@ TIFFDecoder::sample_aspect_ratio_denominator () const
        /* XXX */
        return 1;
 }
-