* commit '51daafb0':
  x86: videodsp: Properly mark sse2 instructions in emulated_edge_mc as such.

Conflicts:
	libavcodec/x86/videodsp_init.c

See: 1b3a7e1fMerged-by: Michael Niedermayer <michaelni@gmx.at>