diff mbox series

[FFmpeg-devel,4/4] avcodec/aac_ac3_parser: Use ff_adts_header_parse_buf()

Message ID GV1P250MB0737B6A380FF10A17B2161E58FE72@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM
State Accepted
Commit a2874c5721eb0913575ee9199df45048d9dd87ae
Headers show
Series [FFmpeg-devel,1/4] avcodec/adts_parser: Don't presume buffer to be padded | expand

Commit Message

Andreas Rheinhardt May 10, 2024, 4:56 p.m. UTC 
instead of avpriv_adts_header_parse(). Using the former avoids
an indirection.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/aac_ac3_parser.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c
index 9305b4c50f..f45631d09f 100644
--- a/libavcodec/aac_ac3_parser.c
+++ b/libavcodec/aac_ac3_parser.c
@@ -144,10 +144,9 @@  get_next:
 #endif
         } else {
 #if CONFIG_AAC_PARSER
-            AACADTSHeaderInfo hdr, *phrd = &hdr;
-            int ret = avpriv_adts_header_parse(&phrd, buf, buf_size);
-
-            if (ret < 0)
+            AACADTSHeaderInfo hdr;
+            if (buf_size < AV_AAC_ADTS_HEADER_SIZE ||
+                ff_adts_header_parse_buf(buf, &hdr) < 0)
                 return i;
 
             bit_rate = hdr.bit_rate;