summaryrefslogtreecommitdiff
path: root/libavcodec/allcodecs.c
diff options
context:
space:
mode:
authorJosh Varner <jlvarner@gmail.com>2005-02-21 17:50:48 +0000
committerMichael Niedermayer <michaelni@gmx.at>2005-02-21 17:50:48 +0000
commitfe533bb3a7400399a927a6347bc21a8d7b6015a3 (patch)
tree1373a55c0e46b1a513b16d97f0718c330360da40 /libavcodec/allcodecs.c
parent09f20d37867baaa0122ffdd75f0481b2b3a08079 (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 'libavcodec/allcodecs.c')
-rw-r--r--libavcodec/allcodecs.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 9b78ebc24e..25d9fbd040 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -57,7 +57,6 @@ void avcodec_register_all(void)
#endif
register_avcodec(&mpeg1video_encoder);
// register_avcodec(&h264_encoder);
-#ifdef CONFIG_RISKY
register_avcodec(&mpeg2video_encoder);
register_avcodec(&h261_encoder);
register_avcodec(&h263_encoder);
@@ -72,7 +71,6 @@ void avcodec_register_all(void)
register_avcodec(&wmv1_encoder);
register_avcodec(&wmv2_encoder);
register_avcodec(&svq1_encoder);
-#endif
register_avcodec(&mjpeg_encoder);
register_avcodec(&ljpeg_encoder);
#ifdef CONFIG_ZLIB
@@ -99,7 +97,6 @@ void avcodec_register_all(void)
/* decoders */
#ifdef CONFIG_DECODERS
-#ifdef CONFIG_RISKY
register_avcodec(&h263_decoder);
register_avcodec(&h261_decoder);
register_avcodec(&mpeg4_decoder);
@@ -128,7 +125,6 @@ void avcodec_register_all(void)
register_avcodec(&aac_decoder);
register_avcodec(&mpeg4aac_decoder);
#endif
-#endif
register_avcodec(&mpeg1video_decoder);
register_avcodec(&mpeg2video_decoder);
register_avcodec(&mpegvideo_decoder);