aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/arm/mpegvideo_armv5te.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-06 13:27:24 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-06 13:27:24 +0100
commit6c3888487686a2e6cd505cb60d58106954e3569b (patch)
treefed5222c8da1b4957ad67cdcbdf878ee7370a07c /libavcodec/arm/mpegvideo_armv5te.c
parent0ddca7d416cc8b80d9943405d6d0bb39bc2dec06 (diff)
parent620289a20e022b9c16c10d546ef86cc0bb77cc84 (diff)
downloadffmpeg-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/arm/mpegvideo_armv5te.c')
-rw-r--r--libavcodec/arm/mpegvideo_armv5te.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/arm/mpegvideo_armv5te.c b/libavcodec/arm/mpegvideo_armv5te.c
index 832c541084..1765a65a6b 100644
--- a/libavcodec/arm/mpegvideo_armv5te.c
+++ b/libavcodec/arm/mpegvideo_armv5te.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/attributes.h"
#include "libavutil/avassert.h"
#include "libavcodec/avcodec.h"
#include "libavcodec/dsputil.h"
@@ -95,7 +96,7 @@ static void dct_unquantize_h263_inter_armv5te(MpegEncContext *s,
ff_dct_unquantize_h263_armv5te(block, qmul, qadd, nCoeffs + 1);
}
-void ff_MPV_common_init_armv5te(MpegEncContext *s)
+av_cold void ff_MPV_common_init_armv5te(MpegEncContext *s)
{
s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_armv5te;
s->dct_unquantize_h263_inter = dct_unquantize_h263_inter_armv5te;