Revert "aacdec: Reconfigure output as needed, disable pop_output_configuration()"

This reverts commit 60dbf2eff92f8aa4683b6dcaba9e694890258ade.

This is not needed anymore, Ticket 1694 has been fixed differently

1 files changed, 6 insertions, 7 deletions

diff --git a/libavcodec/aacsbr.c b/libavcodec/aacsbr.c
index 2dd4c5e44c..8cdf819e23 100644
--- a/libavcodec/aacsbr.c
+++ b/libavcodec/aacsbr.c
@@ -925,13 +925,11 @@ static void read_sbr_extension(AACContext *ac, SpectralBandReplication *sbr,
 {
     switch (bs_extension_id) {
     case EXTENSION_ID_PS:
-        if (ac->oc[1].m4ac.ps != 1) {
-            av_log(ac->avctx, AV_LOG_DEBUG, "Parametric Stereo was found in the bitstream.\n");
-            ac->oc[1].m4ac.ps = 1;
-            ff_aac_output_configure(ac, ac->oc[1].layout_map, ac->oc[1].layout_map_tags,
-                                    ac->oc[1].status, 1);
-        }
-        av_assert0(ac->oc[1].m4ac.ps);
+        if (!ac->oc[1].m4ac.ps) {
+            av_log(ac->avctx, AV_LOG_ERROR, "Parametric Stereo signaled to be not-present but was found in the bitstream.\n");
+            skip_bits_long(gb, *num_bits_left); // bs_fill_bits
+            *num_bits_left = 0;
+        } else {
 #if 1
             *num_bits_left -= ff_ps_read_data(ac->avctx, gb, &sbr->ps, *num_bits_left);
 #else
@@ -939,6 +937,7 @@ static void read_sbr_extension(AACContext *ac, SpectralBandReplication *sbr,
             skip_bits_long(gb, *num_bits_left); // bs_fill_bits
             *num_bits_left = 0;
 #endif
+        }
         break;
     default:
         // some files contain 0-padding