Merge commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Jul 2014 01:12:10 +0000 (03:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Jul 2014 01:19:06 +0000 (03:19 +0200)
commit14e2406de7d211d50fcce0059c90103bdaa947aa
tree10e20cd60b4f4bc91d14957b9565871cdd0381c3
parent5c7bf354dc0c8bea6e7af21c0bc2edad92974274
parenta9aee08d900f686e966c64afec5d88a7d9d130a3
Merge commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3'

* commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3':
  dsputil: Split off FDCT bits into their own context

Conflicts:
configure
libavcodec/Makefile
libavcodec/asvenc.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/x86/Makefile
libavcodec/x86/dsputilenc_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
25 files changed:
configure
libavcodec/Makefile
libavcodec/asv.h
libavcodec/asvenc.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/dvenc.c
libavcodec/fdctdsp.c
libavcodec/fdctdsp.h
libavcodec/libavcodec.v
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/ppc/Makefile
libavcodec/ppc/dsputil_altivec.h
libavcodec/ppc/dsputil_ppc.c
libavcodec/ppc/fdctdsp.c
libavcodec/ppc/fdctdsp.h
libavcodec/proresenc_anatoliy.c
libavcodec/proresenc_kostya.c
libavcodec/x86/Makefile
libavcodec/x86/dsputilenc_mmx.c
libavcodec/x86/fdctdsp_init.c
libavfilter/vf_spp.c
libavfilter/vf_spp.h