generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make DV(B|D) subtitles (en|de)coders be conditonnaly compiled depending on the configure system

Browse Source 
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
This commit is contained in:
Guillaume Poirier 2005-11-21 20:03:35 +00:00
parent 31a78b718b
commit 348e52c91d
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/Makefile
View File

@ -18,7 +18,7 @@ OBJS= bitstream.o utils.o mem.o allcodecs.o \
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 @@ endif
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

17
libavcodec/allcodecs.c
View File

@ -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
}