changeset 2948:aebeb38eea7a libavcodec

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

--- a/Makefile	Sun Nov 20 23:09:05 2005 +0000
+++ b/Makefile	Mon Nov 21 20:03:35 2005 +0000
@@ -18,7 +18,7 @@
       fft.o mdct.o raw.o golomb.o cabac.o\
       dpcm.o adx.o faandct.o parser.o g726.o \
       vp3dsp.o h264idct.o rangecoder.o pnm.o h263.o msmpeg4.o h263dec.o \
-      dvdsub.o dvbsub.o dvbsubdec.o dvdsubenc.o opt.o
+      opt.o
 
 ifeq ($(CONFIG_AASC_DECODER),yes)
     OBJS+= aasc.o
@@ -38,6 +38,18 @@
 ifeq ($(CONFIG_CYUV_DECODER),yes)
     OBJS+= cyuv.o
 endif
+ifeq ($(CONFIG_DVBSUB_DECODER),yes)
+   OBJS+= dvbsubdec.o
+endif
+ifeq ($(CONFIG_DVBSUB_ENCODER),yes)
+   OBJS+= dvbsub.o
+endif
+ifeq ($(CONFIG_DVDSUB_DECODER),yes)
+   OBJS+= dvdsub.o
+endif
+ifeq ($(CONFIG_DVDSUB_ENCODER),yes)
+   OBJS+= dvdsubenc.o
+endif
 ifneq ($(CONFIG_DVVIDEO_DECODER)$(CONFIG_DVVIDEO_ENCODER),)
     OBJS+= dv.o
 endif

--- a/allcodecs.c	Sun Nov 20 23:09:05 2005 +0000
+++ b/allcodecs.c	Mon Nov 21 20:03:35 2005 +0000
@@ -568,15 +568,19 @@
 #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 @@
 #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
 }