[SCM] libav/experimental: cs_test cleanup and fix compilation if gui enabled

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:36:23 UTC 2013


The following commit has been merged in the experimental branch:
commit f184683552090cc9d38a7b1c8d27bb348a2ef7b4
Author: Alex Beregszaszi <alex at rtfs.hu>
Date:   Fri May 23 20:29:36 2003 +0000

    cs_test cleanup and fix compilation if gui enabled
    
    Originally committed as revision 10175 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc

diff --git a/postproc/Makefile b/postproc/Makefile
index c6b5896..78e0b7e 100644
--- a/postproc/Makefile
+++ b/postproc/Makefile
@@ -5,7 +5,6 @@ SWSLIB = libswscale.a
 
 SWSSRCS=swscale.c rgb2rgb.c yuv2rgb.c
 SWSOBJS=$(SWSSRCS:.c=.o)
-CS_TEST_OBJS=cs_test.o rgb2rgb.o ../cpudetect.o ../mp_msg.o ../libvo/aclib.o
 
 CFLAGS  = $(OPTFLAGS) $(MLIB_INC) -I. -I.. $(EXTRA_INC)
 # -I/usr/X11R6/include/
@@ -33,8 +32,8 @@ dep:    depend
 depend:
 	$(CC) -MM $(CFLAGS) $(SWSSRCS) 1>.depend
 
-cs_test: $(CS_TEST_OBJS)
-	$(CC) $(CS_TEST_OBJS) -o cs_test
+cs_test: cs_test.o $(SWSLIB)
+	$(CC) cs_test.o $(SWSLIB) ../cpudetect.o -DFOR_MENCODER ../mp_msg.c -o cs_test -W -Wall
 
 swscale-example: swscale-example.o $(SWSLIB)
 	$(CC) swscale-example.o $(SWSLIB) ../libmpcodecs/img_format.o -lm -o swscale-example -W -Wall

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list