[FFmpeg-cvslog] aacdec_usac: correct Mps212 parsing location

Lynne git at videolan.org
Thu May 1 10:34:58 EEST 2025


ffmpeg | branch: master | Lynne <dev at lynne.ee> | Mon Apr 28 07:57:13 2025 +0200| [9c0349cca1e47794cb0cd243020f211c8e932183] | committer: Lynne

aacdec_usac: correct Mps212 parsing location

It gets parsed after SBR, even if there is no SBR.

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

 libavcodec/aac/aacdec_usac.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavcodec/aac/aacdec_usac.c b/libavcodec/aac/aacdec_usac.c
index ccdf58bc8e..ef0c115aa0 100644
--- a/libavcodec/aac/aacdec_usac.c
+++ b/libavcodec/aac/aacdec_usac.c
@@ -1478,11 +1478,11 @@ static int decode_usac_core_coder(AACDecContext *ac, AACUSACConfig *usac,
         ret = ff_aac_sbr_decode_usac_data(ac, che, ec, gb, sbr_ch, indep_flag);
         if (ret < 0)
             return ret;
+    }
 
-        if (ec->stereo_config_index) {
-            avpriv_report_missing_feature(ac->avctx, "AAC USAC Mps212");
-            return AVERROR_PATCHWELCOME;
-        }
+    if (ec->stereo_config_index) {
+        avpriv_report_missing_feature(ac->avctx, "AAC USAC Mps212");
+        return AVERROR_PATCHWELCOME;
     }
 
     spectrum_decode(ac, usac, che, core_nb_channels);



More information about the ffmpeg-cvslog mailing list