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/aacdec_fixed.c | |
| parent | ff173ce8f1a8d043ce87c02a017ec55bb51b2297 (diff) | |
| parent | b5f19f7478492307e4b4763aeac3180faf50e17f (diff) | |
| download | ffmpeg-streaming-b9d3def9b2cb77eb83542086aa3ac883b4d7efa4.zip ffmpeg-streaming-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/aacdec_fixed.c')
| -rw-r--r-- | libavcodec/aacdec_fixed.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/aacdec_fixed.c b/libavcodec/aacdec_fixed.c index d802f38..ffd577c 100644 --- a/libavcodec/aacdec_fixed.c +++ b/libavcodec/aacdec_fixed.c @@ -75,11 +75,11 @@ #include "aac.h" #include "aactab.h" #include "aacdectab.h" +#include "adts_header.h" #include "cbrt_data.h" #include "sbr.h" #include "aacsbr.h" #include "mpeg4audio.h" -#include "aacadtsdec.h" #include "profiles.h" #include "libavutil/intfloat.h" |
