Merge commit '8d686ca59db14900ad5c12b547fb8a7afc8b0b94'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Jul 2014 13:04:05 +0000 (15:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Jul 2014 13:08:55 +0000 (15:08 +0200)
commit462c6cdb8ed256d2063815b67ca4d14e62e25802
tree324761563d86a2e3e2e8a47dc28e53a407bf8857
parent8324bd51867fdc8a79cbdb5850d36bfd0c741d3f
parent8d686ca59db14900ad5c12b547fb8a7afc8b0b94
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>
libavcodec/Makefile
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideoencdsp.c
libavcodec/mpegvideoencdsp.h
libavcodec/x86/Makefile
libavcodec/x86/dsputilenc_mmx.c
libavcodec/x86/mpegvideoenc_qns_template.c
libavcodec/x86/mpegvideoencdsp_init.c