Mercurial > libavformat.hg

changeset 678:9b2cda2905cc libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removing --disable-risky patch by (Josh Varner <jlvarner gmail com>)
author michael
date Mon, 21 Feb 2005 17:50:48 +0000
parents 6d6a11ba402a
children 54d87ed9b3e4
files Makefile allformats.c
diffstat 2 files changed, 1 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Wed Feb 16 23:14:38 2005 +0000
+++ b/Makefile	Mon Feb 21 17:50:48 2005 +0000
@@ -16,12 +16,7 @@
       avienc.o avidec.o wav.o swf.o au.o gif.o mov.o mpjpeg.o dv.o \
       yuv4mpeg.o 4xm.o flvenc.o flvdec.o movenc.o psxstr.o idroq.o ipmovie.o \
       nut.o wc3movie.o mp3.o westwood.o segafilm.o idcin.o flic.o \
-      sierravmd.o matroska.o sol.o electronicarts.o nsvdec.o
-
-ifeq ($(CONFIG_RISKY),yes)
-OBJS+= asf.o
-OBJS+= asf-enc.o
-endif
+      sierravmd.o matroska.o sol.o electronicarts.o nsvdec.o asf.o asf-enc.o
 
 AMROBJS=
 ifeq ($(AMR_NB),yes)
--- a/allformats.c	Wed Feb 16 23:14:38 2005 +0000
+++ b/allformats.c	Mon Feb 21 17:50:48 2005 +0000
@@ -45,9 +45,7 @@
     raw_init();
     mp3_init();
     rm_init();
-#ifdef CONFIG_RISKY
     asf_init();
-#endif
 #ifdef CONFIG_ENCODERS
     avienc_init();
 #endif //CONFIG_ENCODERS