diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 16:27:24 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 16:27:24 +0400 |
| commit | 6c3888487686a2e6cd505cb60d58106954e3569b (patch) | |
| tree | fed5222c8da1b4957ad67cdcbdf878ee7370a07c /libavcodec/x86/motion_est.c | |
| 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/x86/motion_est.c')
| -rw-r--r-- | libavcodec/x86/motion_est.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/x86/motion_est.c b/libavcodec/x86/motion_est.c index e054a0d27a..670659312f 100644 --- a/libavcodec/x86/motion_est.c +++ b/libavcodec/x86/motion_est.c @@ -22,6 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavutil/avassert.h" #include "libavutil/mem.h" #include "libavutil/x86/asm.h" @@ -432,7 +433,7 @@ PIX_SAD(mmxext) #endif /* HAVE_INLINE_ASM */ -void ff_dsputil_init_pix_mmx(DSPContext* c, AVCodecContext *avctx) +av_cold void ff_dsputil_init_pix_mmx(DSPContext *c, AVCodecContext *avctx) { #if HAVE_INLINE_ASM int mm_flags = av_get_cpu_flags(); |