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/bfin | |
| parent | 0ddca7d416cc8b80d9943405d6d0bb39bc2dec06 (diff) | |
| parent | 620289a20e022b9c16c10d546ef86cc0bb77cc84 (diff) | |
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/bfin')
| -rw-r--r-- | libavcodec/bfin/dsputil_bfin.c | 3 | ||||
| -rw-r--r-- | libavcodec/bfin/mpegvideo_bfin.c | 3 | ||||
| -rw-r--r-- | libavcodec/bfin/vp3_bfin.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/libavcodec/bfin/dsputil_bfin.c b/libavcodec/bfin/dsputil_bfin.c index 656fe0e00a..ce04753bc2 100644 --- a/libavcodec/bfin/dsputil_bfin.c +++ b/libavcodec/bfin/dsputil_bfin.c @@ -21,6 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavcodec/avcodec.h" #include "libavcodec/dsputil.h" #include "dsputil_bfin.h" @@ -195,7 +196,7 @@ static int bfin_pix_abs8_xy2 (void *c, uint8_t *blk1, uint8_t *blk2, int line_si */ -void ff_dsputil_init_bfin( DSPContext* c, AVCodecContext *avctx ) +av_cold void ff_dsputil_init_bfin(DSPContext *c, AVCodecContext *avctx) { const int high_bit_depth = avctx->bits_per_raw_sample > 8; diff --git a/libavcodec/bfin/mpegvideo_bfin.c b/libavcodec/bfin/mpegvideo_bfin.c index 41c47f4d27..2b57ee2e4f 100644 --- a/libavcodec/bfin/mpegvideo_bfin.c +++ b/libavcodec/bfin/mpegvideo_bfin.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavcodec/avcodec.h" #include "libavcodec/dsputil.h" #include "libavcodec/mpegvideo.h" @@ -146,7 +147,7 @@ static int dct_quantize_bfin (MpegEncContext *s, return last_non_zero; } -void ff_MPV_common_init_bfin (MpegEncContext *s) +av_cold void ff_MPV_common_init_bfin (MpegEncContext *s) { /* s->dct_quantize= dct_quantize_bfin; */ } diff --git a/libavcodec/bfin/vp3_bfin.c b/libavcodec/bfin/vp3_bfin.c index d9364790f1..e823a045b1 100644 --- a/libavcodec/bfin/vp3_bfin.c +++ b/libavcodec/bfin/vp3_bfin.c @@ -20,6 +20,7 @@ #include <string.h> +#include "libavutil/attributes.h" #include "libavcodec/avcodec.h" #include "libavcodec/vp3dsp.h" #include "libavcodec/dsputil.h" @@ -50,7 +51,7 @@ void ff_bfin_vp3_idct_add (uint8_t *dest, int line_size, int16_t *block) memset(block, 0, 128); } -void ff_vp3dsp_init_bfin(VP3DSPContext *c, int flags) +av_cold void ff_vp3dsp_init_bfin(VP3DSPContext *c, int flags) { c->idct_add = ff_bfin_vp3_idct_add; c->idct_put = ff_bfin_vp3_idct_put; |