[FFmpeg-cvslog] Support native DTS channel order when requested.

Alexandre Colucci git at videolan.org
Fri May 13 00:24:38 CEST 2011


ffmpeg | branch: master | Alexandre Colucci <alexandre at elgato.com> | Fri May 13 00:21:19 2011 +0200| [a37f7b62461e43f90b30d231e97fb105ae5028fe] | committer: Carl Eugen Hoyos

Support native DTS channel order when requested.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a37f7b62461e43f90b30d231e97fb105ae5028fe
---

 libavcodec/dca.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/libavcodec/dca.c b/libavcodec/dca.c
index 03bf7f7..7a35631 100644
--- a/libavcodec/dca.c
+++ b/libavcodec/dca.c
@@ -1793,6 +1793,10 @@ static int dca_decode_frame(AVCodecContext * avctx,
             s->output = DCA_STEREO;
             avctx->channel_layout = AV_CH_LAYOUT_STEREO;
         }
+        else if (avctx->request_channel_layout & AV_CH_LAYOUT_NATIVE) {
+            static const int8_t dca_channel_order_native[9] = { 0, 1, 2, 3, 4, 5, 6, 7, 8 };
+            s->channel_order_tab = dca_channel_order_native;
+        }
     } else {
         av_log(avctx, AV_LOG_ERROR, "Non standard configuration %d !\n",s->amode);
         return -1;



More information about the ffmpeg-cvslog mailing list