diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 14:32:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 14:32:55 +0100 |
| commit | 2fc662ae63ab79234f7c2996ad4e5c1993f85a18 (patch) | |
| tree | 1d4d3299b037c1b12046ec68a41926da8412deea /libavcodec/aacsbr.h | |
| parent | 5ecf8189c682f41ab315e171e0e7721d7e272138 (diff) | |
| parent | 040c565e51985477a8fa5e42d2ddfb26ebde6608 (diff) | |
Merge commit '040c565e51985477a8fa5e42d2ddfb26ebde6608'
* commit '040c565e51985477a8fa5e42d2ddfb26ebde6608':
doc: developer: Allow tabs in the vim configuration for Automake files
Remove pointless av_cold attributes in header files
Conflicts:
libavcodec/h264.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacsbr.h')
| -rw-r--r-- | libavcodec/aacsbr.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/aacsbr.h b/libavcodec/aacsbr.h index 5d5de8152a..f5e33ab688 100644 --- a/libavcodec/aacsbr.h +++ b/libavcodec/aacsbr.h @@ -34,11 +34,11 @@ #include "sbr.h" /** Initialize SBR. */ -av_cold void ff_aac_sbr_init(void); +void ff_aac_sbr_init(void); /** Initialize one SBR context. */ -av_cold void ff_aac_sbr_ctx_init(AACContext *ac, SpectralBandReplication *sbr); +void ff_aac_sbr_ctx_init(AACContext *ac, SpectralBandReplication *sbr); /** Close one SBR context. */ -av_cold void ff_aac_sbr_ctx_close(SpectralBandReplication *sbr); +void ff_aac_sbr_ctx_close(SpectralBandReplication *sbr); /** Decode one SBR element. */ int ff_decode_sbr_extension(AACContext *ac, SpectralBandReplication *sbr, GetBitContext *gb, int crc, int cnt, int id_aac); |