diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-30 18:56:45 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-30 18:56:45 -0300 |
| commit | b9d3def9b2cb77eb83542086aa3ac883b4d7efa4 (patch) | |
| tree | a35626011027d7ec2a3165dcc09ff912ed9c1821 /libavcodec/aac_parser.c | |
| parent | ff173ce8f1a8d043ce87c02a017ec55bb51b2297 (diff) | |
| parent | b5f19f7478492307e4b4763aeac3180faf50e17f (diff) | |
| download | ffmpeg-b9d3def9b2cb77eb83542086aa3ac883b4d7efa4.tar.gz | |
Merge commit 'b5f19f7478492307e4b4763aeac3180faf50e17f'
* commit 'b5f19f7478492307e4b4763aeac3180faf50e17f':
aac: Split function to parse ADTS header data into public and private part
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/aac_parser.c')
| -rw-r--r-- | libavcodec/aac_parser.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libavcodec/aac_parser.c b/libavcodec/aac_parser.c index 0b868edcb2..b8692625f3 100644 --- a/libavcodec/aac_parser.c +++ b/libavcodec/aac_parser.c @@ -22,7 +22,8 @@ #include "parser.h" #include "aac_ac3_parser.h" -#include "aacadtsdec.h" +#include "adts_header.h" +#include "adts_parser.h" #include "get_bits.h" #include "mpeg4audio.h" @@ -38,9 +39,10 @@ static int aac_sync(uint64_t state, AACAC3ParseContext *hdr_info, } tmp; tmp.u64 = av_be2ne64(state); - init_get_bits(&bits, tmp.u8+8-AAC_ADTS_HEADER_SIZE, AAC_ADTS_HEADER_SIZE * 8); + init_get_bits(&bits, tmp.u8 + 8 - AV_AAC_ADTS_HEADER_SIZE, + AV_AAC_ADTS_HEADER_SIZE * 8); - if ((size = avpriv_aac_parse_header(&bits, &hdr)) < 0) + if ((size = ff_adts_header_parse(&bits, &hdr)) < 0) return 0; *need_next_header = 0; *new_frame_start = 1; @@ -54,7 +56,7 @@ static int aac_sync(uint64_t state, AACAC3ParseContext *hdr_info, static av_cold int aac_parse_init(AVCodecParserContext *s1) { AACAC3ParseContext *s = s1->priv_data; - s->header_size = AAC_ADTS_HEADER_SIZE; + s->header_size = AV_AAC_ADTS_HEADER_SIZE; s->sync = aac_sync; return 0; } |