Revision 95a61cfc

View differences:

configure
1041 1041
h261_encoder_select="aandct"
1042 1042
h263_encoder_select="aandct"
1043 1043
h263_vaapi_hwaccel_deps="va_va_h"
1044
h263_vaapi_hwaccel_select="vaapi"
1044
h263_vaapi_hwaccel_select="vaapi h263_decoder"
1045 1045
h263p_encoder_select="aandct"
1046 1046
h264_decoder_select="golomb"
1047 1047
h264_vaapi_hwaccel_deps="va_va_h"
1048 1048
h264_vaapi_hwaccel_select="vaapi"
1049 1049
h264_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"
1050
h264_vdpau_decoder_select="vdpau"
1050
h264_vdpau_decoder_select="vdpau h264_decoder"
1051 1051
imc_decoder_select="fft mdct"
1052 1052
jpegls_decoder_select="golomb"
1053 1053
jpegls_encoder_select="golomb"
......
1058 1058
mpeg2video_encoder_select="aandct"
1059 1059
mpeg4_encoder_select="aandct"
1060 1060
mpeg_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"
1061
mpeg_vdpau_decoder_select="vdpau"
1061
mpeg_vdpau_decoder_select="vdpau mpegvideo_decoder"
1062 1062
mpeg1_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"
1063
mpeg1_vdpau_decoder_select="vdpau"
1063
mpeg1_vdpau_decoder_select="vdpau mpeg1video_decoder"
1064 1064
mpeg2_vaapi_hwaccel_deps="va_va_h"
1065
mpeg2_vaapi_hwaccel_select="vaapi"
1065
mpeg2_vaapi_hwaccel_select="vaapi mpeg2video_decoder"
1066 1066
mpeg4_vaapi_hwaccel_deps="va_va_h"
1067
mpeg4_vaapi_hwaccel_select="vaapi"
1067
mpeg4_vaapi_hwaccel_select="vaapi mpeg4_decoder"
1068 1068
mpeg_xvmc_decoder_deps="X11_extensions_XvMClib_h"
1069 1069
msmpeg4v1_encoder_select="aandct"
1070 1070
msmpeg4v2_encoder_select="aandct"
......
1088 1088
tiff_encoder_suggest="zlib"
1089 1089
tscc_decoder_select="zlib"
1090 1090
vc1_vaapi_hwaccel_deps="va_va_h"
1091
vc1_vaapi_hwaccel_select="vaapi"
1091
vc1_vaapi_hwaccel_select="vaapi vc1_decoder"
1092 1092
vc1_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"
1093
vc1_vdpau_decoder_select="vdpau"
1093
vc1_vdpau_decoder_select="vdpau vc1_decoder"
1094 1094
vorbis_decoder_select="fft mdct"
1095 1095
vorbis_encoder_select="fft mdct"
1096 1096
wmav1_decoder_select="fft mdct"
......
1100 1100
wmv1_encoder_select="aandct"
1101 1101
wmv2_encoder_select="aandct"
1102 1102
wmv3_vaapi_hwaccel_deps="va_va_h"
1103
wmv3_vaapi_hwaccel_select="vaapi"
1103
wmv3_vaapi_hwaccel_select="vaapi wmv3_decoder"
1104 1104
wmv3_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"
1105
wmv3_vdpau_decoder_select="vdpau"
1105
wmv3_vdpau_decoder_select="vdpau wmv3_decoder"
1106 1106
zlib_decoder_select="zlib"
1107 1107
zlib_encoder_select="zlib"
1108 1108
zmbv_decoder_select="zlib"
libavcodec/Makefile
103 103
OBJS-$(CONFIG_H261_DECODER)            += h261dec.o h261.o mpegvideo.o error_resilience.o
104 104
OBJS-$(CONFIG_H261_ENCODER)            += h261enc.o h261.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12data.o mpegvideo.o
105 105
OBJS-$(CONFIG_H263_DECODER)            += h263dec.o h263.o h263_parser.o mpeg12data.o mpegvideo.o error_resilience.o
106
OBJS-$(CONFIG_H263_VAAPI_HWACCEL)      += h263dec.o h263.o h263_parser.o mpeg12data.o mpegvideo.o error_resilience.o vaapi_mpeg4.o
106
OBJS-$(CONFIG_H263_VAAPI_HWACCEL)      += vaapi_mpeg4.o
107 107
OBJS-$(CONFIG_H263I_DECODER)           += h263dec.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
108 108
OBJS-$(CONFIG_H263_ENCODER)            += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
109 109
OBJS-$(CONFIG_H263P_ENCODER)           += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
110 110
OBJS-$(CONFIG_H264_DECODER)            += h264.o h264idct.o h264pred.o h264_parser.o cabac.o mpegvideo.o error_resilience.o
111 111
OBJS-$(CONFIG_H264_ENCODER)            += h264enc.o h264dspenc.o
112
OBJS-$(CONFIG_H264_VDPAU_DECODER)      += h264.o h264idct.o h264pred.o h264_parser.o cabac.o mpegvideo.o error_resilience.o
113 112
OBJS-$(CONFIG_HUFFYUV_DECODER)         += huffyuv.o
114 113
OBJS-$(CONFIG_HUFFYUV_ENCODER)         += huffyuv.o
115 114
OBJS-$(CONFIG_IDCIN_DECODER)           += idcinvideo.o
......
141 140
OBJS-$(CONFIG_MP3_DECODER)             += mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o
142 141
OBJS-$(CONFIG_MPC7_DECODER)            += mpc7.o mpc.o mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o
143 142
OBJS-$(CONFIG_MPC8_DECODER)            += mpc8.o mpc.o mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o
144
OBJS-$(CONFIG_MPEG_VDPAU_DECODER)      += mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o
145
OBJS-$(CONFIG_MPEG1_VDPAU_DECODER)     += mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o
146 143
OBJS-$(CONFIG_MPEG_XVMC_DECODER)       += mpegvideo_xvmc.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o
147 144
OBJS-$(CONFIG_MPEGVIDEO_DECODER)       += mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o
148 145
OBJS-$(CONFIG_MPEG1VIDEO_DECODER)      += mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o
149 146
OBJS-$(CONFIG_MPEG1VIDEO_ENCODER)      += mpeg12enc.o mpeg12data.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o
150
OBJS-$(CONFIG_MPEG2_VAAPI_HWACCEL)     += mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o vaapi_mpeg2.o
147
OBJS-$(CONFIG_MPEG2_VAAPI_HWACCEL)     += vaapi_mpeg2.o
151 148
OBJS-$(CONFIG_MPEG2VIDEO_DECODER)      += mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o
152 149
OBJS-$(CONFIG_MPEG2VIDEO_ENCODER)      += mpeg12enc.o mpeg12data.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o
153 150
OBJS-$(CONFIG_MPEG4_DECODER)           += h263dec.o h263.o mpeg4video_parser.o mpeg12data.o mpegvideo.o error_resilience.o
154 151
OBJS-$(CONFIG_MPEG4_ENCODER)           += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
155
OBJS-$(CONFIG_MPEG4_VAAPI_HWACCEL)     += h263dec.o h263.o mpeg4video_parser.o mpeg12data.o mpegvideo.o error_resilience.o vaapi_mpeg4.o
152
OBJS-$(CONFIG_MPEG4_VAAPI_HWACCEL)     += vaapi_mpeg4.o
156 153
OBJS-$(CONFIG_MSMPEG4V1_DECODER)       += msmpeg4.o msmpeg4data.o h263dec.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
157 154
OBJS-$(CONFIG_MSMPEG4V1_ENCODER)       += msmpeg4.o msmpeg4data.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
158 155
OBJS-$(CONFIG_MSMPEG4V2_DECODER)       += msmpeg4.o msmpeg4data.o h263dec.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
......
240 237
OBJS-$(CONFIG_V210X_DECODER)           += v210x.o
241 238
OBJS-$(CONFIG_VB_DECODER)              += vb.o
242 239
OBJS-$(CONFIG_VC1_DECODER)             += vc1dec.o vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o msmpeg4.o
243
OBJS-$(CONFIG_VC1_VAAPI_HWACCEL)       += vc1dec.o vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o msmpeg4.o vaapi_vc1.o
244
OBJS-$(CONFIG_VC1_VDPAU_DECODER)       += vc1dec.o vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o msmpeg4.o
240
OBJS-$(CONFIG_VC1_VAAPI_HWACCEL)       += vaapi_vc1.o
245 241
OBJS-$(CONFIG_VCR1_DECODER)            += vcr1.o
246 242
OBJS-$(CONFIG_VCR1_ENCODER)            += vcr1.o
247 243
OBJS-$(CONFIG_VMDAUDIO_DECODER)        += vmdav.o
......
265 261
OBJS-$(CONFIG_WMV2_DECODER)            += wmv2dec.o wmv2.o msmpeg4.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o mpeg12data.o mpegvideo.o error_resilience.o
266 262
OBJS-$(CONFIG_WMV2_ENCODER)            += wmv2enc.o wmv2.o msmpeg4.o msmpeg4data.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
267 263
OBJS-$(CONFIG_WMV3_DECODER)            += vc1dec.o vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o msmpeg4.o
268
OBJS-$(CONFIG_WMV3_VAAPI_HWACCEL)      += vc1dec.o vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o msmpeg4.o vaapi_vc1.o
269
OBJS-$(CONFIG_WMV3_VDPAU_DECODER)      += vc1dec.o vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o msmpeg4.o
264
OBJS-$(CONFIG_WMV3_VAAPI_HWACCEL)      += vaapi_vc1.o
270 265
OBJS-$(CONFIG_WNV1_DECODER)            += wnv1.o
271 266
OBJS-$(CONFIG_WS_SND1_DECODER)         += ws-snd1.o
272 267
OBJS-$(CONFIG_XAN_DPCM_DECODER)        += dpcm.o

Also available in: Unified diff