diff mbox

[FFmpeg-devel] lsws/utils: Split "emms_c(); " call in two lines

Message ID CAB0OVGobHO2ti38AMfHjSvDzMNfEmZS5GPa9uNph21uXnu2TLw@mail.gmail.com
State Rejected
Headers show

Commit Message

Carl Eugen Hoyos Dec. 17, 2018, 1:14 a.m. UTC
Hi!

Attached patch fixes a useless warning when compiling with clang on arm.

Please comment, Carl Eugen

Comments

Michael Niedermayer Dec. 17, 2018, 12:24 p.m. UTC | #1
On Mon, Dec 17, 2018 at 02:14:26AM +0100, Carl Eugen Hoyos wrote:
> Hi!
> 
> Attached patch fixes a useless warning when compiling with clang on arm.
> 
> Please comment, Carl Eugen

>  utils.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> fb6799bbc59d79d9dfba9f8661aaecbed568f3a5  0001-lsws-utils-Split-emms_c-in-two-lines.patch
> From b2773d1ca9473380b99400c2bbd5a6729622f51a Mon Sep 17 00:00:00 2001
> From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
> Date: Mon, 17 Dec 2018 02:12:13 +0100
> Subject: [PATCH] lsws/utils: Split "emms_c();" in two lines.
> 
> Silences a clang warning when not compiling for x86:
> libswscale/utils.c:345:13: warning: while loop has empty body
> ---
>  libswscale/utils.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/libswscale/utils.c b/libswscale/utils.c
> index df68bcc..de64694 100644
> --- a/libswscale/utils.c
> +++ b/libswscale/utils.c
> @@ -342,7 +342,8 @@ static av_cold int initFilter(int16_t **outFilter, int32_t **filterPos,
>      const int64_t fone = 1LL << (54 - FFMIN(av_log2(srcW/dstW), 8));
>      int ret            = -1;
>  
> -    emms_c(); // FIXME should not be required but IS (even for non-MMX versions)
> +    emms_c() // FIXME should not be required but IS (even for non-MMX versions)
> +        ;

this looks like a bad change that could confuse people
i think a different solution should be found or the warning left if theres none

thx

[...]
diff mbox

Patch

From b2773d1ca9473380b99400c2bbd5a6729622f51a Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Date: Mon, 17 Dec 2018 02:12:13 +0100
Subject: [PATCH] lsws/utils: Split "emms_c();" in two lines.

Silences a clang warning when not compiling for x86:
libswscale/utils.c:345:13: warning: while loop has empty body
---
 libswscale/utils.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libswscale/utils.c b/libswscale/utils.c
index df68bcc..de64694 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -342,7 +342,8 @@  static av_cold int initFilter(int16_t **outFilter, int32_t **filterPos,
     const int64_t fone = 1LL << (54 - FFMIN(av_log2(srcW/dstW), 8));
     int ret            = -1;
 
-    emms_c(); // FIXME should not be required but IS (even for non-MMX versions)
+    emms_c() // FIXME should not be required but IS (even for non-MMX versions)
+        ;
 
     // NOTE: the +3 is for the MMX(+1) / SSE(+3) scaler which reads over the end
     FF_ALLOC_ARRAY_OR_GOTO(NULL, *filterPos, (dstW + 3), sizeof(**filterPos), fail);
-- 
1.7.10.4