diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 20:59:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 21:10:10 +0200 |
| commit | d7463c681363d6057601e705d0bf775738529841 (patch) | |
| tree | 5aaab61d15d220df649ead3e432c36f72219ab2a /libavcodec/Makefile | |
| parent | 32cf26cc6a0dc1425ed60b8ac99552fd858fab9b (diff) | |
| parent | fab9df63a3156ffe1f9490aafaea41e03ef60ddf (diff) | |
Merge commit 'fab9df63a3156ffe1f9490aafaea41e03ef60ddf'
* commit 'fab9df63a3156ffe1f9490aafaea41e03ef60ddf':
dsputil: Split off global motion compensation bits into a separate context
Conflicts:
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/ppc/dsputil_altivec.h
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 2732e89c87..28539e02e5 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -73,8 +73,8 @@ OBJS-$(CONFIG_MPEGAUDIODSP) += mpegaudiodsp.o \ mpegaudiodsp_data.o \ mpegaudiodsp_fixed.o \ mpegaudiodsp_float.o -OBJS-$(CONFIG_MPEGVIDEO) += mpegvideo.o mpegvideo_motion.o \ - mpegutils.o +OBJS-$(CONFIG_MPEGVIDEO) += mpegvideo.o mpegvideodsp.o \ + mpegvideo_motion.o mpegutils.o OBJS-$(CONFIG_MPEGVIDEOENC) += mpegvideo_enc.o mpeg12data.o \ motion_est.o ratecontrol.o OBJS-$(CONFIG_QPELDSP) += qpeldsp.o |