diff options
| author | Josh Varner <jlvarner@gmail.com> | 2005-02-21 17:50:48 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-02-21 17:50:48 +0000 |
| commit | fe533bb3a7400399a927a6347bc21a8d7b6015a3 (patch) | |
| tree | 1373a55c0e46b1a513b16d97f0718c330360da40 /libavformat | |
| parent | 09f20d37867baaa0122ffdd75f0481b2b3a08079 (diff) | |
removing --disable-risky patch by (Josh Varner <jlvarner gmail com>)
Originally committed as revision 3966 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, 1 insertions, 8 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index db7562eb5f..d41aabbabe 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -16,12 +16,7 @@ OBJS+=mpeg.o mpegts.o mpegtsenc.o ffm.o crc.o img.o img2.o raw.o rm.o \ 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) diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 45b98fcd64..fd5877c905 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -45,9 +45,7 @@ void av_register_all(void) raw_init(); mp3_init(); rm_init(); -#ifdef CONFIG_RISKY asf_init(); -#endif #ifdef CONFIG_ENCODERS avienc_init(); #endif //CONFIG_ENCODERS |