Merge commit '65d5d5865845f057cc6530a8d0f34db952d9009c'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 May 2014 22:01:45 +0000 (00:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 May 2014 22:01:45 +0000 (00:01 +0200)
commitea0931fb962f2436695606a8ef9a4811e4970e22
treeb7e21eae75f3345b7c0d71855e7e611f1eca4f54
parentcb8763bda7e5e59064193e6b29b0f806560f66d3
parent65d5d5865845f057cc6530a8d0f34db952d9009c
Merge commit '65d5d5865845f057cc6530a8d0f34db952d9009c'

* commit '65d5d5865845f057cc6530a8d0f34db952d9009c':
  dsputil: Move SVQ1 encoding specific bits into svq1enc

Conflicts:
libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/ppc/int_altivec.c
libavcodec/ppc/svq1enc_altivec.c
libavcodec/svq1enc.c
libavcodec/svq1enc.h
libavcodec/x86/Makefile
libavcodec/x86/dsputilenc_mmx.c
libavcodec/x86/svq1enc_mmx.c