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/x86/mpegaudiodec.c | |
| 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/x86/mpegaudiodec.c')
| -rw-r--r-- | libavcodec/x86/mpegaudiodec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/x86/mpegaudiodec.c b/libavcodec/x86/mpegaudiodec.c index 44cbf9a428..ee93a84956 100644 --- a/libavcodec/x86/mpegaudiodec.c +++ b/libavcodec/x86/mpegaudiodec.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" @@ -232,7 +233,7 @@ DECL_IMDCT_BLOCKS(avx,avx) #endif #endif /* HAVE_YASM */ -void ff_mpadsp_init_x86(MPADSPContext *s) +av_cold void ff_mpadsp_init_x86(MPADSPContext *s) { int mm_flags = av_get_cpu_flags(); |