aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/arm/h264dsp_init_arm.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-06 13:27:24 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-06 13:27:24 +0100
commit6c3888487686a2e6cd505cb60d58106954e3569b (patch)
treefed5222c8da1b4957ad67cdcbdf878ee7370a07c /libavcodec/arm/h264dsp_init_arm.c
parent0ddca7d416cc8b80d9943405d6d0bb39bc2dec06 (diff)
parent620289a20e022b9c16c10d546ef86cc0bb77cc84 (diff)
downloadffmpeg-6c3888487686a2e6cd505cb60d58106954e3569b.tar.gz
Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'
* commit '620289a20e022b9c16c10d546ef86cc0bb77cc84': sh4: Fix silly type vs. variable name search and replace typo configure: Group all hwaccels together in a separate variable Add av_cold attributes to arch-specific init functions Conflicts: configure libavcodec/arm/mpegvideo_armv5te.c libavcodec/x86/mlpdsp.c libavcodec/x86/motion_est.c libavcodec/x86/mpegvideoenc.c libavcodec/x86/videodsp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/h264dsp_init_arm.c')
-rw-r--r--libavcodec/arm/h264dsp_init_arm.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/arm/h264dsp_init_arm.c b/libavcodec/arm/h264dsp_init_arm.c
index 4695707cf7..e08e87e125 100644
--- a/libavcodec/arm/h264dsp_init_arm.c
+++ b/libavcodec/arm/h264dsp_init_arm.c
@@ -20,6 +20,7 @@
#include <stdint.h>
+#include "libavutil/attributes.h"
#include "libavutil/arm/cpu.h"
#include "libavcodec/dsputil.h"
#include "libavcodec/h264dsp.h"
@@ -68,7 +69,8 @@ void ff_h264_idct8_add4_neon(uint8_t *dst, const int *block_offset,
int16_t *block, int stride,
const uint8_t nnzc[6*8]);
-static void ff_h264dsp_init_neon(H264DSPContext *c, const int bit_depth, const int chroma_format_idc)
+static av_cold void ff_h264dsp_init_neon(H264DSPContext *c, const int bit_depth,
+ const int chroma_format_idc)
{
#if HAVE_NEON
if (bit_depth == 8) {
@@ -100,7 +102,8 @@ static void ff_h264dsp_init_neon(H264DSPContext *c, const int bit_depth, const i
#endif // HAVE_NEON
}
-void ff_h264dsp_init_arm(H264DSPContext *c, const int bit_depth, const int chroma_format_idc)
+av_cold void ff_h264dsp_init_arm(H264DSPContext *c, const int bit_depth,
+ const int chroma_format_idc)
{
int cpu_flags = av_get_cpu_flags();