[FFmpeg-cvslog] swscale/x86/rgb2rgb_template: don't call emms on sse2/avx functions

James Almer git at videolan.org
Fri Jun 26 21:41:56 CEST 2015


ffmpeg | branch: release/2.7 | James Almer <jamrial at gmail.com> | Tue Jun 23 01:14:42 2015 -0300| [7f2ab5e50ff725e8d297b22c78b7fb4bcfc09652] | committer: James Almer

swscale/x86/rgb2rgb_template: don't call emms on sse2/avx functions

Reviewed-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: James Almer <jamrial at gmail.com>
(cherry picked from commit 0c15f2f158e11950c2a5c831787ea377b7671bf4)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7f2ab5e50ff725e8d297b22c78b7fb4bcfc09652
---

 libswscale/x86/rgb2rgb_template.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libswscale/x86/rgb2rgb_template.c b/libswscale/x86/rgb2rgb_template.c
index fd04923..a1f7434 100644
--- a/libswscale/x86/rgb2rgb_template.c
+++ b/libswscale/x86/rgb2rgb_template.c
@@ -1943,7 +1943,9 @@ static void RENAME(interleaveBytes)(const uint8_t *src1, const uint8_t *src2, ui
         src2 += src2Stride;
     }
     __asm__(
+#if !COMPILE_TEMPLATE_SSE2
             EMMS"       \n\t"
+#endif
             SFENCE"     \n\t"
             ::: "memory"
             );
@@ -1971,7 +1973,9 @@ static void RENAME(deinterleaveBytes)(const uint8_t *src, uint8_t *dst1, uint8_t
         dst2 += dst2Stride;
     }
     __asm__(
+#if !COMPILE_TEMPLATE_SSE2
             EMMS"       \n\t"
+#endif
             SFENCE"     \n\t"
             ::: "memory"
             );



More information about the ffmpeg-cvslog mailing list