diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-04 13:49:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-04 13:49:17 +0100 |
| commit | ba4fba8f487380a0152b73ba6f9f5e5556322ae7 (patch) | |
| tree | 54852b218d42e3bd155961e72c966ac957626b49 /libavcodec/mpeg4audio.h | |
| parent | dd72e26d0cea78093324bdc5c0088aa53f2983a2 (diff) | |
| parent | d615187f74ddf3413778a8b5b7ae17255b0df88e (diff) | |
| download | ffmpeg-ba4fba8f487380a0152b73ba6f9f5e5556322ae7.tar.gz | |
Merge commit 'd615187f74ddf3413778a8b5b7ae17255b0df88e'
* commit 'd615187f74ddf3413778a8b5b7ae17255b0df88e':
aacdec: Support for ER AAC ELD 480.
Conflicts:
libavcodec/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4audio.h')
| -rw-r--r-- | libavcodec/mpeg4audio.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/mpeg4audio.h b/libavcodec/mpeg4audio.h index 0f410455f5..a3d37247f7 100644 --- a/libavcodec/mpeg4audio.h +++ b/libavcodec/mpeg4audio.h @@ -38,6 +38,7 @@ typedef struct MPEG4AudioConfig { int ext_chan_config; int channels; int ps; ///< -1 implicit, 1 presence + int frame_length_short; } MPEG4AudioConfig; extern av_export const int avpriv_mpeg4audio_sample_rates[16]; |