mlp_parser: avoid mapping multiple disctinct TrueHD channels to the same Libav channel.
authorTim Walker <tdskywalker@gmail.com>
Wed, 12 Sep 2012 15:09:32 +0000 (17:09 +0200)
committerJustin Ruggles <justin.ruggles@gmail.com>
Wed, 12 Sep 2012 22:26:53 +0000 (18:26 -0400)
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
libavcodec/mlp_parser.c

index 016252c..4c1cf9b 100644 (file)
@@ -83,10 +83,10 @@ static const uint64_t thd_layout[13] = {
     AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT,                       // LRrs
     AV_CH_BACK_CENTER,                                      // Cs
     AV_CH_TOP_CENTER,                                       // Ts
-    AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT,                       // LRsd
+    AV_CH_SURROUND_DIRECT_LEFT|AV_CH_SURROUND_DIRECT_RIGHT, // LRsd
     AV_CH_WIDE_LEFT|AV_CH_WIDE_RIGHT,                       // LRw
     AV_CH_TOP_FRONT_CENTER,                                 // Cvh
-    AV_CH_LOW_FREQUENCY                                     // LFE2
+    AV_CH_LOW_FREQUENCY_2,                                  // LFE2
 };
 
 static int mlp_samplerate(int in)