From 30d70e79a6b4ac7f4eb66446a9da275161ef6ea7 Mon Sep 17 00:00:00 2001
From: Tim Walker <tdskywalker@gmail.com>
Date: Wed, 11 Dec 2013 02:03:31 +0000
Subject: dcadec: set AV_FRAME_DATA_MATRIXENCODING side data.

---
 libavcodec/dcadec.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'libavcodec/dcadec.c')

diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
index f3afb4e0f0..f9e39bcca4 100644
--- a/libavcodec/dcadec.c
+++ b/libavcodec/dcadec.c
@@ -2001,6 +2001,15 @@ FF_ENABLE_DEPRECATION_WARNINGS
     for (i = 0; i < 2 * s->lfe * 4; i++)
         s->lfe_data[i] = s->lfe_data[i + lfe_samples];
 
+    /* AVMatrixEncoding
+     *
+     * DCA_STEREO_TOTAL (Lt/Rt) is equivalent to Dolby Surround */
+    ret = ff_side_data_update_matrix_encoding(frame,
+                                              (s->output & ~DCA_LFE) == DCA_STEREO_TOTAL ?
+                                              AV_MATRIX_ENCODING_DOLBY : AV_MATRIX_ENCODING_NONE);
+    if (ret < 0)
+        return ret;
+
     *got_frame_ptr = 1;
 
     return buf_size;
-- 
cgit v1.2.3