virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

Allow conditional compilation of H.263-related decoders.

Browse Source 
Originally committed as revision 8949 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2007-05-09 09:26:06 +00:00
parent 2462e4b765
commit 4a815a7f64
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -676,10 +676,20 @@ CMDLINE_SELECT="
dxa_decoder_deps="zlib" dxa_decoder_deps="zlib"
flashsv_decoder_deps="zlib" flashsv_decoder_deps="zlib"
flashsv_encoder_deps="zlib" flashsv_encoder_deps="zlib"
flv_decoder_deps="h263_decoder"
h263_decoder_deps="h263_parser" h263_decoder_deps="h263_parser"
h263i_decoder_deps="h263_decoder"
mpeg_xvmc_decoder_deps="xvmc" mpeg_xvmc_decoder_deps="xvmc"
mpeg4_decoder_deps="h263_decoder"
msmpeg4v1_decoder_deps="h263_decoder"
msmpeg4v2_decoder_deps="h263_decoder"
msmpeg4v3_decoder_deps="h263_decoder"
png_decoder_deps="zlib" png_decoder_deps="zlib"
png_encoder_deps="zlib" png_encoder_deps="zlib"
vc1_decoder_deps="h263_decoder"
wmv1_decoder_deps="h263_decoder"
wmv2_decoder_deps="h263_decoder"
wmv3_decoder_deps="h263_decoder"
x264_encoder_deps="x264" x264_encoder_deps="x264"
xvid_encoder_deps="xvid" xvid_encoder_deps="xvid"
zmbv_decoder_deps="zlib" zmbv_decoder_deps="zlib"

9
libavcodec/Makefile
View File

@ -37,8 +37,6 @@ OBJS= bitstream.o \
rangecoder.o \ rangecoder.o \
pnm.o \ pnm.o \
h263.o \ h263.o \
msmpeg4.o \
h263dec.o \
opt.o \ opt.o \
bitstream_filter.o \ bitstream_filter.o \
audioconvert.o \ audioconvert.o \
@ -93,6 +91,7 @@ OBJS-$(CONFIG_GIF_DECODER) += gifdec.o lzw.o
OBJS-$(CONFIG_GIF_ENCODER) += gif.o OBJS-$(CONFIG_GIF_ENCODER) += gif.o
OBJS-$(CONFIG_H261_DECODER) += h261.o OBJS-$(CONFIG_H261_DECODER) += h261.o
OBJS-$(CONFIG_H261_ENCODER) += h261.o OBJS-$(CONFIG_H261_ENCODER) += h261.o
OBJS-$(CONFIG_H263_DECODER) += h263dec.o
OBJS-$(CONFIG_H264_DECODER) += h264.o OBJS-$(CONFIG_H264_DECODER) += h264.o
OBJS-$(CONFIG_H264_ENCODER) += h264enc.o h264dsp.o OBJS-$(CONFIG_H264_ENCODER) += h264enc.o h264dsp.o
OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o
@ -110,6 +109,12 @@ OBJS-$(CONFIG_MACE6_DECODER) += mace.o
OBJS-$(CONFIG_MMVIDEO_DECODER) += mmvideo.o OBJS-$(CONFIG_MMVIDEO_DECODER) += mmvideo.o
OBJS-$(CONFIG_MP2_ENCODER) += mpegaudio.o OBJS-$(CONFIG_MP2_ENCODER) += mpegaudio.o
OBJS-$(CONFIG_MPC7_DECODER) += mpc.o OBJS-$(CONFIG_MPC7_DECODER) += mpc.o
OBJS-$(CONFIG_MSMPEG4V1_DECODER) += msmpeg4.o
OBJS-$(CONFIG_MSMPEG4V1_ENCODER) += msmpeg4.o
OBJS-$(CONFIG_MSMPEG4V2_DECODER) += msmpeg4.o
OBJS-$(CONFIG_MSMPEG4V2_ENCODER) += msmpeg4.o
OBJS-$(CONFIG_MSMPEG4V3_DECODER) += msmpeg4.o
OBJS-$(CONFIG_MSMPEG4V3_ENCODER) += msmpeg4.o
OBJS-$(CONFIG_MSRLE_DECODER) += msrle.o OBJS-$(CONFIG_MSRLE_DECODER) += msrle.o
OBJS-$(CONFIG_MSVIDEO1_DECODER) += msvideo1.o OBJS-$(CONFIG_MSVIDEO1_DECODER) += msvideo1.o
OBJS-$(CONFIG_MSZH_DECODER) += lcl.o OBJS-$(CONFIG_MSZH_DECODER) += lcl.o

2
libavcodec/wmv2.c
View File

@ -835,6 +835,7 @@ static int wmv2_decode_init(AVCodecContext *avctx){
return 0; return 0;
} }
#ifdef CONFIG_WMV2_DECODER
AVCodec wmv2_decoder = { AVCodec wmv2_decoder = {
"wmv2", "wmv2",
CODEC_TYPE_VIDEO, CODEC_TYPE_VIDEO,
@ -846,6 +847,7 @@ AVCodec wmv2_decoder = {
ff_h263_decode_frame, ff_h263_decode_frame,
CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
}; };
#endif
#ifdef CONFIG_ENCODERS #ifdef CONFIG_ENCODERS
AVCodec wmv2_encoder = { AVCodec wmv2_encoder = {