diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-04 19:18:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-04 19:18:08 +0200 |
| commit | 91a8b933fb6d9bf41f5885793bfcc0cb24de6100 (patch) | |
| tree | 7b8ba48cf2f3a22f4316acf2cf387ced43ec056f /libavcodec | |
| parent | a52e74db17e56a49464d36c9168f5fea5ce2be02 (diff) | |
| parent | 803f8992f11d1eb301672cd13c685a7b1d04c467 (diff) | |
| download | ffmpeg-91a8b933fb6d9bf41f5885793bfcc0cb24de6100.tar.gz | |
Merge commit '803f8992f11d1eb301672cd13c685a7b1d04c467'
* commit '803f8992f11d1eb301672cd13c685a7b1d04c467':
build: cosmetics: Group hwaccel OBJS declarations together
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index b0ce0a6249..8a56bd0c8a 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -42,7 +42,6 @@ OBJS-$(CONFIG_BSWAPDSP) += bswapdsp.o OBJS-$(CONFIG_CABAC) += cabac.o OBJS-$(CONFIG_CRYSTALHD) += crystalhd.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_EXIF) += exif.o tiff_common.o OBJS-$(CONFIG_FDCTDSP) += fdctdsp.o faandct.o \ @@ -93,9 +92,6 @@ OBJS-$(CONFIG_SHARED) += log2_tab.o 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 @@ -649,6 +645,11 @@ OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER) += adpcmenc.o adpcm_data.o OBJS-$(CONFIG_VIMA_DECODER) += vima.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 vaapi_mpeg.o OBJS-$(CONFIG_H263_VDPAU_HWACCEL) += vdpau_mpeg4.o OBJS-$(CONFIG_H264_DXVA2_HWACCEL) += dxva2_h264.o |