summaryrefslogtreecommitdiff
path: root/libavcodec/dcadec.c
diff options
context:
space:
mode:
authorTim Walker <tdskywalker@gmail.com>2013-12-11 02:03:31 +0000
committerTim Walker <tdskywalker@gmail.com>2014-01-05 16:41:56 +0100
commit30d70e79a6b4ac7f4eb66446a9da275161ef6ea7 (patch)
treed38b1df0ad6e6b981b613e7431d87e2a7fd079f3 /libavcodec/dcadec.c
parent6bfdb2de881372048be7fbda643417e1fd3ce93c (diff)
dcadec: set AV_FRAME_DATA_MATRIXENCODING side data.
Diffstat (limited to 'libavcodec/dcadec.c')
-rw-r--r--libavcodec/dcadec.c9
1 files changed, 9 insertions, 0 deletions
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;