diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-20 22:21:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-20 22:26:31 +0100 |
| commit | 011d83de488d2051c485a1618dda0a43d77bcbc7 (patch) | |
| tree | dbde540836a29c1effe020f0a92c1c5978cd3c8d /libavcodec/aarch64 | |
| parent | 3775224b2f8a9c2c0bf5d53272236d4a1ffb0875 (diff) | |
| parent | 0e083d7e43805db1a978cb57bfa25fda62e8ff18 (diff) | |
| download | ffmpeg-011d83de488d2051c485a1618dda0a43d77bcbc7.tar.gz | |
Merge commit '0e083d7e43805db1a978cb57bfa25fda62e8ff18'
* commit '0e083d7e43805db1a978cb57bfa25fda62e8ff18':
build: Group general components separate from de/encoders in arch Makefiles
Conflicts:
libavcodec/arm/Makefile
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aarch64')
| -rw-r--r-- | libavcodec/aarch64/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/aarch64/Makefile b/libavcodec/aarch64/Makefile index af89f93ac6..59d1762269 100644 --- a/libavcodec/aarch64/Makefile +++ b/libavcodec/aarch64/Makefile @@ -3,6 +3,7 @@ OBJS-$(CONFIG_H264DSP) += aarch64/h264dsp_init_aarch64.o OBJS-$(CONFIG_H264QPEL) += aarch64/h264qpel_init_aarch64.o OBJS-$(CONFIG_HPELDSP) += aarch64/hpeldsp_init_aarch64.o OBJS-$(CONFIG_NEON_CLOBBER_TEST) += aarch64/neontest.o + OBJS-$(CONFIG_RV40_DECODER) += aarch64/rv40dsp_init_aarch64.o OBJS-$(CONFIG_VC1_DECODER) += aarch64/vc1dsp_init_aarch64.o |