[SCM] libav/experimental: Add conditional build of strptime

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:32:56 UTC 2013


The following commit has been merged in the experimental branch:
commit 487ec9a0d92796a3c725d4ab750b39b2fa5d554c
Author: Philip Gladstone <philipjsg at users.sourceforge.net>
Date:   Sat Jul 27 03:00:39 2002 +0000

    Add conditional build of strptime
    
    Originally committed as revision 820 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libav/Makefile b/libav/Makefile
index 6f6df89..eb11986 100644
--- a/libav/Makefile
+++ b/libav/Makefile
@@ -12,10 +12,15 @@ OBJS= utils.o cutils.o allformats.o
 
 # mux and demuxes
 OBJS+=mpeg.o mpegts.o ffm.o crc.o img.o raw.o rm.o asf.o \
-      avienc.o avidec.o wav.o swf.o au.o gif.o mov.o jpeg.o
+      avienc.o avidec.o wav.o swf.o au.o gif.o mov.o jpeg.o 
+# framehook.o
 # file I/O
 OBJS+= avio.o aviobuf.o file.o 
 
+ifeq ($(BUILD_STRPTIME),yes)
+OBJS+= strptime.o
+endif
+
 ifeq ($(CONFIG_VIDEO4LINUX),yes)
 OBJS+= grab.o
 endif

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list