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/asv.h | |
| parent | 5ecf8189c682f41ab315e171e0e7721d7e272138 (diff) | |
| parent | 040c565e51985477a8fa5e42d2ddfb26ebde6608 (diff) | |
| download | ffmpeg-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/asv.h')
| -rw-r--r-- | libavcodec/asv.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/asv.h b/libavcodec/asv.h index 72d98c0b33..ca67c67daa 100644 --- a/libavcodec/asv.h +++ b/libavcodec/asv.h @@ -28,7 +28,6 @@ #include <stdint.h> -#include "libavutil/attributes.h" #include "libavutil/mem.h" #include "avcodec.h" @@ -62,6 +61,6 @@ extern const uint8_t ff_asv_dc_ccp_tab[8][2]; extern const uint8_t ff_asv_ac_ccp_tab[16][2]; extern const uint8_t ff_asv2_level_tab[63][2]; -av_cold void ff_asv_common_init(AVCodecContext *avctx); +void ff_asv_common_init(AVCodecContext *avctx); #endif /* AVCODEC_ASV_H */ |