[FFmpeg-cvslog] avcodec/aac_ac3_parser: Use ff_adts_header_parse_buf()

Andreas Rheinhardt git at videolan.org
Mon May 20 13:22:23 EEST 2024


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Thu May  9 16:30:11 2024 +0200| [a2874c5721eb0913575ee9199df45048d9dd87ae] | committer: Andreas Rheinhardt

avcodec/aac_ac3_parser: Use ff_adts_header_parse_buf()

instead of avpriv_adts_header_parse(). Using the former avoids
an indirection.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

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

 libavcodec/aac_ac3_parser.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

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;



More information about the ffmpeg-cvslog mailing list