mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-24 13:56:33 +02:00
de17ccc774
* commit '51daafb02eaf96e0743a37ce95a7f5d02c1fa3c2': x86: videodsp: Properly mark sse2 instructions in emulated_edge_mc as such. Conflicts: libavcodec/x86/videodsp_init.c See: 1b3a7e1f42c3d89253e9837ada98e6bfb0cbab2f Merged-by: Michael Niedermayer <michaelni@gmx.at>