diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 13:27:24 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 13:27:24 +0100 |
commit | 6c3888487686a2e6cd505cb60d58106954e3569b (patch) | |
tree | fed5222c8da1b4957ad67cdcbdf878ee7370a07c /libavcodec/ppc | |
parent | 0ddca7d416cc8b80d9943405d6d0bb39bc2dec06 (diff) | |
parent | 620289a20e022b9c16c10d546ef86cc0bb77cc84 (diff) | |
download | ffmpeg-streaming-6c3888487686a2e6cd505cb60d58106954e3569b.zip ffmpeg-streaming-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/ppc')
-rw-r--r-- | libavcodec/ppc/dsputil_altivec.c | 3 | ||||
-rw-r--r-- | libavcodec/ppc/dsputil_ppc.c | 3 | ||||
-rw-r--r-- | libavcodec/ppc/fmtconvert_altivec.c | 3 | ||||
-rw-r--r-- | libavcodec/ppc/h264_altivec.c | 4 | ||||
-rw-r--r-- | libavcodec/ppc/h264_qpel.c | 4 | ||||
-rw-r--r-- | libavcodec/ppc/int_altivec.c | 3 | ||||
-rw-r--r-- | libavcodec/ppc/mpegaudiodec_altivec.c | 3 | ||||
-rw-r--r-- | libavcodec/ppc/mpegvideo_altivec.c | 3 | ||||
-rw-r--r-- | libavcodec/ppc/vc1dsp_altivec.c | 3 | ||||
-rw-r--r-- | libavcodec/ppc/videodsp_ppc.c | 3 | ||||
-rw-r--r-- | libavcodec/ppc/vorbisdsp_altivec.c | 3 |
11 files changed, 24 insertions, 11 deletions
diff --git a/libavcodec/ppc/dsputil_altivec.c b/libavcodec/ppc/dsputil_altivec.c index 1527bd0..75a6a6a 100644 --- a/libavcodec/ppc/dsputil_altivec.c +++ b/libavcodec/ppc/dsputil_altivec.c @@ -24,6 +24,7 @@ #if HAVE_ALTIVEC_H #include <altivec.h> #endif +#include "libavutil/attributes.h" #include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" #include "libavcodec/dsputil.h" @@ -1346,7 +1347,7 @@ static void avg_pixels8_xy2_altivec(uint8_t *block, const uint8_t *pixels, ptrdi } } -void ff_dsputil_init_altivec(DSPContext* c, AVCodecContext *avctx) +av_cold void ff_dsputil_init_altivec(DSPContext *c, AVCodecContext *avctx) { const int high_bit_depth = avctx->bits_per_raw_sample > 8; diff --git a/libavcodec/ppc/dsputil_ppc.c b/libavcodec/ppc/dsputil_ppc.c index 50aa188..24aa88f 100644 --- a/libavcodec/ppc/dsputil_ppc.c +++ b/libavcodec/ppc/dsputil_ppc.c @@ -22,6 +22,7 @@ #include <string.h> +#include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/mem.h" #include "libavcodec/dsputil.h" @@ -137,7 +138,7 @@ static long check_dcbzl_effect(void) } #endif -void ff_dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx) +av_cold void ff_dsputil_init_ppc(DSPContext *c, AVCodecContext *avctx) { const int high_bit_depth = avctx->bits_per_raw_sample > 8; int mm_flags = av_get_cpu_flags(); diff --git a/libavcodec/ppc/fmtconvert_altivec.c b/libavcodec/ppc/fmtconvert_altivec.c index 740614d..b29c7d4 100644 --- a/libavcodec/ppc/fmtconvert_altivec.c +++ b/libavcodec/ppc/fmtconvert_altivec.c @@ -21,6 +21,7 @@ #include "libavcodec/fmtconvert.h" #include "libavutil/ppc/util_altivec.h" +#include "libavutil/attributes.h" #include "libavutil/mem.h" #include "dsputil_altivec.h" @@ -155,7 +156,7 @@ static void float_to_int16_interleave_altivec(int16_t *dst, const float **src, } } -void ff_fmt_convert_init_altivec(FmtConvertContext *c, AVCodecContext *avctx) +av_cold void ff_fmt_convert_init_altivec(FmtConvertContext *c, AVCodecContext *avctx) { c->int32_to_float_fmul_scalar = int32_to_float_fmul_scalar_altivec; if (!(avctx->flags & CODEC_FLAG_BITEXACT)) { diff --git a/libavcodec/ppc/h264_altivec.c b/libavcodec/ppc/h264_altivec.c index 89c0643..46ee61c 100644 --- a/libavcodec/ppc/h264_altivec.c +++ b/libavcodec/ppc/h264_altivec.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/intreadwrite.h" #include "libavutil/ppc/types_altivec.h" @@ -718,7 +719,8 @@ static void ff_biweight_h264_pixels ## W ## _altivec(uint8_t *dst, uint8_t *src, H264_WEIGHT(16) H264_WEIGHT( 8) -void ff_h264dsp_init_ppc(H264DSPContext *c, const int bit_depth, const int chroma_format_idc) +av_cold void ff_h264dsp_init_ppc(H264DSPContext *c, const int bit_depth, + const int chroma_format_idc) { if (av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC) { if (bit_depth == 8) { diff --git a/libavcodec/ppc/h264_qpel.c b/libavcodec/ppc/h264_qpel.c index 39d68e0..26e333e 100644 --- a/libavcodec/ppc/h264_qpel.c +++ b/libavcodec/ppc/h264_qpel.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include "libavutil/attributes.h" #include "libavcodec/h264qpel.h" #if HAVE_ALTIVEC @@ -286,7 +287,8 @@ void ff_dsputil_h264_init_ppc(DSPContext* c, AVCodecContext *avctx) } #endif /* HAVE_ALTIVEC */ -void ff_h264qpel_init_ppc(H264QpelContext* c, int bit_depth) { +av_cold void ff_h264qpel_init_ppc(H264QpelContext *c, int bit_depth) +{ #if HAVE_ALTIVEC const int high_bit_depth = bit_depth > 8; diff --git a/libavcodec/ppc/int_altivec.c b/libavcodec/ppc/int_altivec.c index 5a73876..4386b13 100644 --- a/libavcodec/ppc/int_altivec.c +++ b/libavcodec/ppc/int_altivec.c @@ -28,6 +28,7 @@ #include <altivec.h> #endif +#include "libavutil/attributes.h" #include "libavutil/ppc/types_altivec.h" #include "libavcodec/dsputil.h" @@ -136,7 +137,7 @@ static int32_t scalarproduct_and_madd_int16_altivec(int16_t *v1, const int16_t * return ires; } -void ff_int_init_altivec(DSPContext* c, AVCodecContext *avctx) +av_cold void ff_int_init_altivec(DSPContext *c, AVCodecContext *avctx) { c->ssd_int8_vs_int16 = ssd_int8_vs_int16_altivec; c->scalarproduct_int16 = scalarproduct_int16_altivec; diff --git a/libavcodec/ppc/mpegaudiodec_altivec.c b/libavcodec/ppc/mpegaudiodec_altivec.c index 7d829b8..bf6e1c3 100644 --- a/libavcodec/ppc/mpegaudiodec_altivec.c +++ b/libavcodec/ppc/mpegaudiodec_altivec.c @@ -20,6 +20,7 @@ */ #include "dsputil_altivec.h" +#include "libavutil/attributes.h" #include "libavutil/ppc/util_altivec.h" #include "libavcodec/dsputil.h" #include "libavcodec/mpegaudiodsp.h" @@ -123,7 +124,7 @@ static void apply_window_mp3(float *in, float *win, int *unused, float *out, *out = sum; } -void ff_mpadsp_init_altivec(MPADSPContext *s) +av_cold void ff_mpadsp_init_altivec(MPADSPContext *s) { s->apply_window_float = apply_window_mp3; } diff --git a/libavcodec/ppc/mpegvideo_altivec.c b/libavcodec/ppc/mpegvideo_altivec.c index 6a1a065..249f565 100644 --- a/libavcodec/ppc/mpegvideo_altivec.c +++ b/libavcodec/ppc/mpegvideo_altivec.c @@ -24,6 +24,7 @@ #include <stdlib.h> #include <stdio.h> +#include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" @@ -112,7 +113,7 @@ static void dct_unquantize_h263_altivec(MpegEncContext *s, } -void ff_MPV_common_init_altivec(MpegEncContext *s) +av_cold void ff_MPV_common_init_altivec(MpegEncContext *s) { if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC)) return; diff --git a/libavcodec/ppc/vc1dsp_altivec.c b/libavcodec/ppc/vc1dsp_altivec.c index 5c46eed..5bbb20f 100644 --- a/libavcodec/ppc/vc1dsp_altivec.c +++ b/libavcodec/ppc/vc1dsp_altivec.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" #include "libavcodec/dsputil.h" @@ -335,7 +336,7 @@ static void vc1_inv_trans_8x4_altivec(uint8_t *dest, int stride, int16_t *block) #undef OP_U8_ALTIVEC #undef PREFIX_no_rnd_vc1_chroma_mc8_altivec -void ff_vc1dsp_init_altivec(VC1DSPContext* dsp) +av_cold void ff_vc1dsp_init_altivec(VC1DSPContext *dsp) { if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC)) return; diff --git a/libavcodec/ppc/videodsp_ppc.c b/libavcodec/ppc/videodsp_ppc.c index 0fe515f..9157022 100644 --- a/libavcodec/ppc/videodsp_ppc.c +++ b/libavcodec/ppc/videodsp_ppc.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavcodec/videodsp.h" static void prefetch_ppc(uint8_t *mem, ptrdiff_t stride, int h) @@ -29,7 +30,7 @@ static void prefetch_ppc(uint8_t *mem, ptrdiff_t stride, int h) } while(--h); } -void ff_videodsp_init_ppc(VideoDSPContext *ctx, int bpc) +av_cold void ff_videodsp_init_ppc(VideoDSPContext *ctx, int bpc) { ctx->prefetch = prefetch_ppc; } diff --git a/libavcodec/ppc/vorbisdsp_altivec.c b/libavcodec/ppc/vorbisdsp_altivec.c index cff881f..08a2b26 100644 --- a/libavcodec/ppc/vorbisdsp_altivec.c +++ b/libavcodec/ppc/vorbisdsp_altivec.c @@ -22,6 +22,7 @@ #if HAVE_ALTIVEC_H #include <altivec.h> #endif +#include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavcodec/vorbisdsp.h" @@ -50,7 +51,7 @@ static void vorbis_inverse_coupling_altivec(float *mag, float *ang, } #endif /* HAVE_ALTIVEC */ -void ff_vorbisdsp_init_ppc(VorbisDSPContext* c) +av_cold void ff_vorbisdsp_init_ppc(VorbisDSPContext *c) { #if HAVE_ALTIVEC if (av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC) { |