Merge commit '58e65e44f435243dc72dfce1f8af8afcf1319f34'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 25 Jul 2014 11:11:23 +0000 (13:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 25 Jul 2014 11:11:23 +0000 (13:11 +0200)
* commit '58e65e44f435243dc72dfce1f8af8afcf1319f34':
  vc1dsp: Add wrappers for {avg|put}_vc1_mspel_mc00_c

Conflicts:
libavcodec/vc1dsp.c

See: 319235c67c59d6abaa78d5af57121ab9816f937d
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge