* commit '58e65e44f435243dc72dfce1f8af8afcf1319f34': vc1dsp: Add wrappers for {avg|put}_vc1_mspel_mc00_c Conflicts: libavcodec/vc1dsp.c See: 319235c67c Merged-by: Michael Niedermayer <michaelni@gmx.at>
319235c67c