* commit '51daafb02eaf96e0743a37ce95a7f5d02c1fa3c2':
x86: videodsp: Properly mark sse2 instructions in emulated_edge_mc as such.
Conflicts:
libavcodec/x86/videodsp_init.c
See: 1b3a7e1f42
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 KiB
11 KiB