From: Diego Biurrun Date: Mon, 1 Sep 2014 12:35:58 +0000 (-0700) Subject: build: cosmetics: Group hwaccel OBJS declarations together X-Git-Tag: android-x86-6.0-r1~10^2~835 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=803f8992f11d1eb301672cd13c685a7b1d04c467;p=android-x86%2Fexternal-ffmpeg.git build: cosmetics: Group hwaccel OBJS declarations together --- diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 752340f599..fd194f40bf 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -35,7 +35,6 @@ OBJS-$(CONFIG_BLOCKDSP) += blockdsp.o OBJS-$(CONFIG_BSWAPDSP) += bswapdsp.o OBJS-$(CONFIG_CABAC) += cabac.o OBJS-$(CONFIG_DCT) += dct.o dct32_fixed.o dct32_float.o -OBJS-$(CONFIG_DXVA2) += dxva2.o OBJS-$(CONFIG_ERROR_RESILIENCE) += error_resilience.o OBJS-$(CONFIG_FDCTDSP) += fdctdsp.o faandct.o \ jfdctfst.o jfdctint.o @@ -81,9 +80,6 @@ OBJS-$(CONFIG_RDFT) += rdft.o $(RDFT-OBJS-yes) OBJS-$(CONFIG_SINEWIN) += sinewin.o OBJS-$(CONFIG_STARTCODE) += startcode.o OBJS-$(CONFIG_TPELDSP) += tpeldsp.o -OBJS-$(CONFIG_VAAPI) += vaapi.o -OBJS-$(CONFIG_VDA) += vda.o -OBJS-$(CONFIG_VDPAU) += vdpau.o OBJS-$(CONFIG_VIDEODSP) += videodsp.o OBJS-$(CONFIG_VP3DSP) += vp3dsp.o @@ -541,6 +537,11 @@ OBJS-$(CONFIG_ADPCM_YAMAHA_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER) += adpcmenc.o adpcm_data.o # hardware accelerators +OBJS-$(CONFIG_DXVA2) += dxva2.o +OBJS-$(CONFIG_VAAPI) += vaapi.o +OBJS-$(CONFIG_VDA) += vda.o +OBJS-$(CONFIG_VDPAU) += vdpau.o + OBJS-$(CONFIG_H263_VAAPI_HWACCEL) += vaapi_mpeg4.o OBJS-$(CONFIG_H263_VDPAU_HWACCEL) += vdpau_mpeg4.o OBJS-$(CONFIG_H264_DXVA2_HWACCEL) += dxva2_h264.o