virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Do not check for both CONFIG_VC1_DECODER and CONFIG_WMV3_DECODER,

Browse Source 
the former depends upon the latter.

Originally committed as revision 19533 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2009-07-29 09:54:49 +00:00
parent e0f58e39c4
commit 9be6f0d2f8
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/dsputil.c
View File

@ -2756,7 +2756,7 @@ void ff_avg_cavs_qpel16_mc00_c(uint8_t *dst, uint8_t *src, int stride) {
void ff_mlp_init(DSPContext* c, AVCodecContext *avctx);
#if CONFIG_VC1_DECODER || CONFIG_WMV3_DECODER
#if CONFIG_VC1_DECODER
/* VC-1 specific */
void ff_vc1dsp_init(DSPContext* c, AVCodecContext *avctx);
@ -2766,7 +2766,7 @@ void ff_put_vc1_mspel_mc00_c(uint8_t *dst, uint8_t *src, int stride, int rnd) {
void ff_avg_vc1_mspel_mc00_c(uint8_t *dst, uint8_t *src, int stride, int rnd) {
avg_pixels8_c(dst, src, stride, 8);
}
#endif /* CONFIG_VC1_DECODER||CONFIG_WMV3_DECODER */
#endif /* CONFIG_VC1_DECODER */
void ff_intrax8dsp_init(DSPContext* c, AVCodecContext *avctx);
@ -4548,10 +4548,10 @@ void dsputil_init(DSPContext* c, AVCodecContext *avctx)
#if CONFIG_MLP_DECODER || CONFIG_TRUEHD_DECODER
ff_mlp_init(c, avctx);
#endif
#if CONFIG_VC1_DECODER || CONFIG_WMV3_DECODER
#if CONFIG_VC1_DECODER
ff_vc1dsp_init(c,avctx);
#endif
#if CONFIG_WMV2_DECODER || CONFIG_VC1_DECODER || CONFIG_WMV3_DECODER
#if CONFIG_WMV2_DECODER || CONFIG_VC1_DECODER
ff_intrax8dsp_init(c,avctx);
#endif
#if CONFIG_RV30_DECODER

2
libavcodec/msmpeg4.c
View File

@ -109,7 +109,7 @@ static av_cold void common_init(MpegEncContext * s)
s->y_dc_scale_table= wmv1_y_dc_scale_table;
s->c_dc_scale_table= wmv1_c_dc_scale_table;
break;
#if CONFIG_WMV3_DECODER || CONFIG_VC1_DECODER
#if CONFIG_VC1_DECODER
case 6:
s->y_dc_scale_table= wmv3_dc_scale_table;
s->c_dc_scale_table= wmv3_dc_scale_table;

3
libavcodec/msmpeg4.h
View File

@ -53,8 +53,7 @@ int ff_wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64]);
CONFIG_MSMPEG4V2_DECODER || \
CONFIG_MSMPEG4V3_DECODER || \
CONFIG_WMV2_DECODER || \
CONFIG_VC1_DECODER || \
CONFIG_WMV3_DECODER)
CONFIG_VC1_DECODER)
#define CONFIG_MSMPEG4_ENCODER (CONFIG_MSMPEG4V1_ENCODER || \
CONFIG_MSMPEG4V2_ENCODER || \
CONFIG_MSMPEG4V3_ENCODER || \

2
libavcodec/ppc/dsputil_ppc.c
View File

@ -268,7 +268,7 @@ void dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx)
mm_flags |= FF_MM_ALTIVEC;
dsputil_init_altivec(c, avctx);
if(CONFIG_VC1_DECODER || CONFIG_WMV3_DECODER)
if(CONFIG_VC1_DECODER)
vc1dsp_init_altivec(c, avctx);
float_init_altivec(c, avctx);
int_init_altivec(c, avctx);

2
libavcodec/x86/dsputil_mmx.c
View File

@ -2866,7 +2866,7 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx)
if (CONFIG_CAVS_DECODER)
ff_cavsdsp_init_mmx2(c, avctx);
if (CONFIG_VC1_DECODER || CONFIG_WMV3_DECODER)
if (CONFIG_VC1_DECODER)
ff_vc1dsp_init_mmx(c, avctx);
c->add_png_paeth_prediction= add_png_paeth_prediction_mmx2;