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/wma_common.h | |
| parent | 5ecf8189c682f41ab315e171e0e7721d7e272138 (diff) | |
| parent | 040c565e51985477a8fa5e42d2ddfb26ebde6608 (diff) | |
| download | ffmpeg-streaming-2fc662ae63ab79234f7c2996ad4e5c1993f85a18.zip ffmpeg-streaming-2fc662ae63ab79234f7c2996ad4e5c1993f85a18.tar.gz | |
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/wma_common.h')
| -rw-r--r-- | libavcodec/wma_common.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/wma_common.h b/libavcodec/wma_common.h index 84d2cda..55404af 100644 --- a/libavcodec/wma_common.h +++ b/libavcodec/wma_common.h @@ -21,9 +21,7 @@ #ifndef AVCODEC_WMA_COMMON_H #define AVCODEC_WMA_COMMON_H -#include "libavutil/attributes.h" - -av_cold int ff_wma_get_frame_len_bits(int sample_rate, int version, - unsigned int decode_flags); +int ff_wma_get_frame_len_bits(int sample_rate, int version, + unsigned int decode_flags); #endif /* AVCODEC_WMA_COMMON_H */ |
