[FFmpeg-cvslog] s86/scale: Do not return the result of a (void) function from a void function.

Carl Eugen Hoyos git at videolan.org
Thu Jun 19 19:16:53 CEST 2014


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Thu Jun 19 18:45:13 2014 +0200| [891307b4d194d4de628da302224c3a97b6f2c840] | committer: Carl Eugen Hoyos

s86/scale: Do not return the result of a (void) function from a void function.

Fixes compilation with Sun C 5.12.
Reported by Bradley Mitchell in ticket #3649.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=891307b4d194d4de628da302224c3a97b6f2c840
---

 libswscale/x86/swscale.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c
index d853800..98cded2 100644
--- a/libswscale/x86/swscale.c
+++ b/libswscale/x86/swscale.c
@@ -202,7 +202,8 @@ static void yuv2yuvX_sse3(const int16_t *filter, int filterSize,
                            const uint8_t *dither, int offset)
 {
     if(((int)dest) & 15){
-        return yuv2yuvX_mmxext(filter, filterSize, src, dest, dstW, dither, offset);
+        yuv2yuvX_mmxext(filter, filterSize, src, dest, dstW, dither, offset);
+        return;
     }
     if (offset) {
         __asm__ volatile("movq       (%0), %%xmm3\n\t"



More information about the ffmpeg-cvslog mailing list