aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/allcodecs.c
diff options
context:
space:
mode:
authorGuillaume Poirier <gpoirier@mplayerhq.hu>2005-11-21 20:03:35 +0000
committerGuillaume Poirier <gpoirier@mplayerhq.hu>2005-11-21 20:03:35 +0000
commit348e52c91ded1c242eeaaa05c20dac335d030853 (patch)
treedbc036a6b4ecf8cc8867423a74f3fd917d974d9f /libavcodec/allcodecs.c
parent31a78b718beb4cd5e73be90c3db5c7ea1eddb2f0 (diff)
downloadffmpeg-348e52c91ded1c242eeaaa05c20dac335d030853.tar.gz
Make DV(B|D) subtitles (en|de)coders be conditonnaly compiled depending on the configure system
Original thread: Date: Nov 20, 2005 9:25 PM Subject: [PATCH] make dvdsub encoder depend on config variables Originally committed as revision 4709 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/allcodecs.c')
-rw-r--r--libavcodec/allcodecs.c17
1 files changed, 13 insertions, 4 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index ff075f26ad..8f371ba95b 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -568,15 +568,19 @@ PCM_CODEC(CODEC_ID_ADPCM_YAMAHA, adpcm_yamaha);
#undef PCM_CODEC
/* subtitles */
-#ifdef CONFIG_ENCODERS
- register_avcodec(&dvbsub_encoder);
+#ifdef CONFIG_DVDSUB_DECODER
+ register_avcodec(&dvdsub_decoder);
+#endif
+#ifdef CONFIG_DVDSUB_ENCODER
register_avcodec(&dvdsub_encoder);
#endif
-#ifdef CONFIG_DECODERS
- register_avcodec(&dvdsub_decoder);
+#ifdef CONFIG_DVBSUB_DECODER
register_avcodec(&dvbsub_decoder);
#endif
+#ifdef CONFIG_DVBSUB_ENCODER
+ register_avcodec(&dvbsub_encoder);
+#endif
/* parsers */
av_register_codec_parser(&mpegvideo_parser);
@@ -595,7 +599,12 @@ PCM_CODEC(CODEC_ID_ADPCM_YAMAHA, adpcm_yamaha);
#ifdef CONFIG_AC3
av_register_codec_parser(&ac3_parser);
#endif
+
+#ifdef CONFIG_DVDSUB_DECODER
av_register_codec_parser(&dvdsub_parser);
+#endif
+#ifdef CONFIG_DVBSUB_DECODER
av_register_codec_parser(&dvbsub_parser);
+#endif
}