diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-05 22:34:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-05 22:34:21 +0100 |
| commit | ae01af24756d6f5bd13eef405ca19a8bf458b39f (patch) | |
| tree | 22e1a46e4f14bcdc3297aca73ea14e49af439323 /libavcodec/dcadec.c | |
| parent | bc7f76377c1e8850af163646a98ab086a84f5d66 (diff) | |
| parent | 30d70e79a6b4ac7f4eb66446a9da275161ef6ea7 (diff) | |
| download | ffmpeg-ae01af24756d6f5bd13eef405ca19a8bf458b39f.tar.gz | |
Merge commit '30d70e79a6b4ac7f4eb66446a9da275161ef6ea7'
* commit '30d70e79a6b4ac7f4eb66446a9da275161ef6ea7':
dcadec: set AV_FRAME_DATA_MATRIXENCODING side data.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dcadec.c')
| -rw-r--r-- | libavcodec/dcadec.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index d7af481449..9f7ee54bd4 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -2560,6 +2560,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; |