[FFmpeg-cvslog] tests/tiny_ssim: include the 2 macros instead of a header

Michael Niedermayer git at videolan.org
Wed Mar 27 01:43:52 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 27 01:38:18 2013 +0100| [e370b6589778363227fb60a793faf800dfaa805f] | committer: Michael Niedermayer

tests/tiny_ssim: include the 2 macros instead of a header

Should fix compilation on open solaris

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 tests/tiny_ssim.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/tiny_ssim.c b/tests/tiny_ssim.c
index c1c819d..759a84b 100644
--- a/tests/tiny_ssim.c
+++ b/tests/tiny_ssim.c
@@ -32,8 +32,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "libavutil/avutil.h"
-
+#define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0)
+#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
 
 #define BIT_DEPTH 8
 #define PIXEL_MAX ((1 << BIT_DEPTH)-1)



More information about the ffmpeg-cvslog mailing list