Merge commit 'dd3aa85b68c017c419acb0c39ff6aa890ce89e87'
authorJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 20:18:20 +0000 (17:18 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 20:19:52 +0000 (17:19 -0300)
* commit 'dd3aa85b68c017c419acb0c39ff6aa890ce89e87':
  aac_ac3_parser: Drop in-parser downmix functionality

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/aac_ac3_parser.c

index c9ba6bf..4e834b4 100644 (file)
@@ -86,20 +86,8 @@ get_next:
            the frame). */
         if (avctx->codec_id != AV_CODEC_ID_AAC) {
             avctx->sample_rate = s->sample_rate;
-
-            /* (E-)AC-3: allow downmixing to stereo or mono */
-            if (s->channels > 1 &&
-                avctx->request_channel_layout == AV_CH_LAYOUT_MONO) {
-                avctx->channels       = 1;
-                avctx->channel_layout = AV_CH_LAYOUT_MONO;
-            } else if (s->channels > 2 &&
-                       avctx->request_channel_layout == AV_CH_LAYOUT_STEREO) {
-                avctx->channels       = 2;
-                avctx->channel_layout = AV_CH_LAYOUT_STEREO;
-            } else {
-                avctx->channels = s->channels;
-                avctx->channel_layout = s->channel_layout;
-            }
+            avctx->channels = s->channels;
+            avctx->channel_layout = s->channel_layout;
             s1->duration = s->samples;
             avctx->audio_service_type = s->service_type;
         }