[FFmpeg-cvslog] dcadec: set AV_FRAME_DATA_MATRIXENCODING side data.
Tim Walker
git at videolan.org
Sun Jan 5 22:38:54 CET 2014
ffmpeg | branch: master | Tim Walker <tdskywalker at gmail.com> | Wed Dec 11 02:03:31 2013 +0000| [30d70e79a6b4ac7f4eb66446a9da275161ef6ea7] | committer: Tim Walker
dcadec: set AV_FRAME_DATA_MATRIXENCODING side data.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=30d70e79a6b4ac7f4eb66446a9da275161ef6ea7
---
libavcodec/dcadec.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
index f3afb4e..f9e39bc 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;
More information about the ffmpeg-cvslog
mailing list