Merge commit '096cc11ec102701a18951b4f0437d609081ca1dd'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Feb 2013 10:59:25 +0000 (11:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Feb 2013 10:59:31 +0000 (11:59 +0100)
commit04ec796bda7919058d6a75cf11b9a387a207375a
tree3af6ae3c211098a5b2ba2bc2d21bbf42f441d6a8
parentf2bbc2ffc33871bc2901f94dbfaae60497a9f7c5
parent096cc11ec102701a18951b4f0437d609081ca1dd
Merge commit '096cc11ec102701a18951b4f0437d609081ca1dd'

* commit '096cc11ec102701a18951b4f0437d609081ca1dd':
  x86: vc1dsp: Move ff_avg_vc1_mspel_mc00_mmxext out of dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_mmx.h
libavcodec/x86/h264_qpel.c
libavcodec/x86/vc1dsp_mmx.c