diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-07 15:04:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-07 15:08:55 +0200 |
| commit | 462c6cdb8ed256d2063815b67ca4d14e62e25802 (patch) | |
| tree | 324761563d86a2e3e2e8a47dc28e53a407bf8857 /libavcodec/x86/Makefile | |
| parent | 8324bd51867fdc8a79cbdb5850d36bfd0c741d3f (diff) | |
| parent | 8d686ca59db14900ad5c12b547fb8a7afc8b0b94 (diff) | |
| download | ffmpeg-462c6cdb8ed256d2063815b67ca4d14e62e25802.tar.gz | |
Merge commit '8d686ca59db14900ad5c12b547fb8a7afc8b0b94'
* commit '8d686ca59db14900ad5c12b547fb8a7afc8b0b94':
dsputil: Split off *_8x8basis to a separate context
Conflicts:
libavcodec/dsputil.c
libavcodec/mpegvideo_enc.c
libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/Makefile')
| -rw-r--r-- | libavcodec/x86/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index d376bb73e1..f757be177d 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -28,7 +28,8 @@ OBJS-$(CONFIG_LPC) += x86/lpc.o OBJS-$(CONFIG_MPEGAUDIODSP) += x86/mpegaudiodsp.o OBJS-$(CONFIG_MPEGVIDEO) += x86/mpegvideo.o \ x86/mpegvideodsp.o -OBJS-$(CONFIG_MPEGVIDEOENC) += x86/mpegvideoenc.o +OBJS-$(CONFIG_MPEGVIDEOENC) += x86/mpegvideoenc.o \ + x86/mpegvideoencdsp_init.o OBJS-$(CONFIG_QPELDSP) += x86/qpeldsp_init.o OBJS-$(CONFIG_VIDEODSP) += x86/videodsp_init.o OBJS-$(CONFIG_VP3DSP) += x86/vp3dsp_init.o |