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/sh4 | |
| parent | 0ddca7d416cc8b80d9943405d6d0bb39bc2dec06 (diff) | |
| parent | 620289a20e022b9c16c10d546ef86cc0bb77cc84 (diff) | |
| download | ffmpeg-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/sh4')
| -rw-r--r-- | libavcodec/sh4/dsputil_align.c | 6 | ||||
| -rw-r--r-- | libavcodec/sh4/dsputil_sh4.c | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/sh4/dsputil_align.c b/libavcodec/sh4/dsputil_align.c index 14274091c0..b227bbb97b 100644 --- a/libavcodec/sh4/dsputil_align.c +++ b/libavcodec/sh4/dsputil_align.c @@ -20,7 +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 "dsputil_sh4.h" @@ -262,7 +262,7 @@ if (sz==16) { \ #define DEFFUNC(op,rnd,xy,sz,OP_N,avgfunc) \ static void op##_##rnd##_pixels##sz##_##xy (uint8_t * dest, const uint8_t * ref, \ - const int ptrdiff_t, int height) \ + const ptrdiff_t stride, int height) \ { \ switch((int)ref&3) { \ case 0:OP_N##0(sz,rnd##_##avgfunc); return; \ @@ -326,7 +326,7 @@ DEFFUNC(avg,no_rnd,xy,16,OP_XY,PACK) #endif -void ff_dsputil_init_align(DSPContext* c, AVCodecContext *avctx) +av_cold void ff_dsputil_init_align(DSPContext *c, AVCodecContext *avctx) { const int high_bit_depth = avctx->bits_per_raw_sample > 8; diff --git a/libavcodec/sh4/dsputil_sh4.c b/libavcodec/sh4/dsputil_sh4.c index 5296bcf1b7..6e19fa0958 100644 --- a/libavcodec/sh4/dsputil_sh4.c +++ b/libavcodec/sh4/dsputil_sh4.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 "dsputil_sh4.h" @@ -89,7 +90,7 @@ static void idct_add(uint8_t *dest, int line_size, int16_t *block) } } -void ff_dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx) +av_cold void ff_dsputil_init_sh4(DSPContext *c, AVCodecContext *avctx) { const int idct_algo= avctx->idct_algo; const int high_bit_depth = avctx->bits_per_raw_sample > 8; |