From fb09531720a4aa2dfa97e5a9a246a453b6278fd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 3 Apr 2007 01:18:24 +0200 Subject: Sync with a more recent version of FFmpeg. --- contrib/ffmpeg/libavcodec/alpha/dsputil_alpha_asm.S | 6 +++--- contrib/ffmpeg/libavcodec/alpha/motion_est_mvi_asm.S | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'contrib/ffmpeg/libavcodec/alpha') diff --git a/contrib/ffmpeg/libavcodec/alpha/dsputil_alpha_asm.S b/contrib/ffmpeg/libavcodec/alpha/dsputil_alpha_asm.S index 367f2d743..dbdf279ba 100644 --- a/contrib/ffmpeg/libavcodec/alpha/dsputil_alpha_asm.S +++ b/contrib/ffmpeg/libavcodec/alpha/dsputil_alpha_asm.S @@ -53,7 +53,7 @@ put_pixels_axp_asm: .frame sp, 0, ra .prologue 0 -#ifdef HAVE_GPROF +#ifdef CONFIG_GPROF lda AT, _mcount jsr AT, (AT), _mcount #endif @@ -150,7 +150,7 @@ put_pixels_clamped_mvi_asm: .frame sp, 0, ra .prologue 0 -#ifdef HAVE_GPROF +#ifdef CONFIG_GPROF lda AT, _mcount jsr AT, (AT), _mcount #endif @@ -205,7 +205,7 @@ add_pixels_clamped_mvi_asm: .frame sp, 0, ra .prologue 0 -#ifdef HAVE_GPROF +#ifdef CONFIG_GPROF lda AT, _mcount jsr AT, (AT), _mcount #endif diff --git a/contrib/ffmpeg/libavcodec/alpha/motion_est_mvi_asm.S b/contrib/ffmpeg/libavcodec/alpha/motion_est_mvi_asm.S index 6015a7824..cdf40b1f3 100644 --- a/contrib/ffmpeg/libavcodec/alpha/motion_est_mvi_asm.S +++ b/contrib/ffmpeg/libavcodec/alpha/motion_est_mvi_asm.S @@ -55,7 +55,7 @@ pix_abs16x16_mvi_asm: .frame sp, 0, ra, 0 .prologue 0 -#ifdef HAVE_GPROF +#ifdef CONFIG_GPROF lda AT, _mcount jsr AT, (AT), _mcount #endif -- cgit v1.2.3