Merge commit '51daafb02eaf96e0743a37ce95a7f5d02c1fa3c2'

* 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 years ago · de17ccc774
parent a85a718f26 51daafb02e
commit de17ccc774
1 changed files with 2 additions and 1 deletions
--- a/libavcodec/x86/videodsp_init.c
+++ b/libavcodec/x86/videodsp_init.c
@ -231,7 +231,8 @@ static av_noinline void emulated_edge_mc_sse2(uint8_t *buf, const uint8_t *src,
                                              ptrdiff_t buf_stride,
                                              ptrdiff_t src_stride,
                                              int block_w, int block_h,
-                                              int src_x, int src_y, int w, int h)
+                                              int src_x, int src_y, int w,
+                                              int h)
 {
    emulated_edge_mc(buf, src, buf_stride, src_stride, block_w, block_h,
                     src_x, src_y, w, h, vfixtbl_sse, &ff_emu_edge_vvar_sse,