diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-01-29 12:00:11 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-01-29 12:00:11 +0000 |
| commit | 1d0d55daf48a806561ebe3e9f61f62c3f7b93b9d (patch) | |
| tree | 8ea5db552c5461da4de8db652dc3a8ad01351eda /libavformat | |
| parent | 02d697aa5f1afb7d74fee87183d56b9c8764da7c (diff) | |
| download | ffmpeg-1d0d55daf48a806561ebe3e9f61f62c3f7b93b9d.tar.gz | |
--disable-risky support
Originally committed as revision 1522 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 7 | ||||
| -rw-r--r-- | libavformat/allformats.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index e3fcbd7179..a81845724f 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -11,9 +11,14 @@ CFLAGS= $(OPTFLAGS) -Wall -g -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_ 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 \ +OBJS+=mpeg.o mpegts.o ffm.o crc.o img.o raw.o rm.o \ avienc.o avidec.o wav.o swf.o au.o gif.o mov.o jpeg.o dv.o \ yuv4mpeg.o + +ifeq ($(CONFIG_RISKY),yes) +OBJS+= asf.o +endif + # image formats OBJS+= pnm.o yuv.o # file I/O diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 47bcb4f9c6..9a5e03a3bc 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -35,7 +35,9 @@ void av_register_all(void) img_init(); raw_init(); rm_init(); +#ifdef CONFIG_RISKY asf_init(); +#endif avienc_init(); avidec_init(); wav_init(); |