[FFmpeg-cvslog] x86: Place mm_flags variable declaration below the appropriate #ifdef.
Diego Biurrun
git at videolan.org
Wed Feb 1 03:06:29 CET 2012
ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Mon Jan 30 09:39:16 2012 +0100| [c30b198381706e94aab1097e49d2638763312b05] | committer: Diego Biurrun
x86: Place mm_flags variable declaration below the appropriate #ifdef.
This fixes some unused variable warnings with YASM disabled.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c30b198381706e94aab1097e49d2638763312b05
---
libavcodec/x86/fmtconvert_mmx.c | 2 +-
libavcodec/x86/rv40dsp.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/x86/fmtconvert_mmx.c b/libavcodec/x86/fmtconvert_mmx.c
index 17079d3..42cb0bc 100644
--- a/libavcodec/x86/fmtconvert_mmx.c
+++ b/libavcodec/x86/fmtconvert_mmx.c
@@ -110,9 +110,9 @@ static void float_interleave_sse(float *dst, const float **src,
void ff_fmt_convert_init_x86(FmtConvertContext *c, AVCodecContext *avctx)
{
+#if HAVE_YASM
int mm_flags = av_get_cpu_flags();
-#if HAVE_YASM
if (mm_flags & AV_CPU_FLAG_MMX) {
c->float_interleave = float_interleave_mmx;
diff --git a/libavcodec/x86/rv40dsp.c b/libavcodec/x86/rv40dsp.c
index 9f90ad8..b429de7 100644
--- a/libavcodec/x86/rv40dsp.c
+++ b/libavcodec/x86/rv40dsp.c
@@ -42,9 +42,9 @@ void ff_avg_rv40_chroma_mc4_3dnow(uint8_t *dst, uint8_t *src,
void ff_rv40dsp_init_x86(RV34DSPContext *c, DSPContext *dsp)
{
- av_unused int mm_flags = av_get_cpu_flags();
-
#if HAVE_YASM
+ int mm_flags = av_get_cpu_flags();
+
if (mm_flags & AV_CPU_FLAG_MMX) {
c->put_chroma_pixels_tab[0] = ff_put_rv40_chroma_mc8_mmx;
c->put_chroma_pixels_tab[1] = ff_put_rv40_chroma_mc4_mmx;
More information about the ffmpeg-cvslog
mailing list