Merge commit '42c4c2d2a6dc48adb0e901ef5617acfba0a3a18e'
authorClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 14:54:44 +0000 (15:54 +0100)
committerClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 14:54:44 +0000 (15:54 +0100)
* commit '42c4c2d2a6dc48adb0e901ef5617acfba0a3a18e':
  aac: Drop broken cruft

Merged-by: Clément Bœsch <u@pkh.me>
libavcodec/aacsbr_template.c

index f8aa485..cf8621e 100644 (file)
@@ -941,14 +941,8 @@ static void read_sbr_extension(AACContext *ac, SpectralBandReplication *sbr,
             skip_bits_long(gb, *num_bits_left); // bs_fill_bits
             *num_bits_left = 0;
         } else {
-#if 1
             *num_bits_left -= AAC_RENAME(ff_ps_read_data)(ac->avctx, gb, &sbr->ps, *num_bits_left);
             ac->avctx->profile = FF_PROFILE_AAC_HE_V2;
-#else
-            avpriv_report_missing_feature(ac->avctx, "Parametric Stereo");
-            skip_bits_long(gb, *num_bits_left); // bs_fill_bits
-            *num_bits_left = 0;
-#endif
         }
         break;
     default: