[FFmpeg-cvslog] Merge commit 'dc7501e524dc3270335749302c7aa449973625f3'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Fri Oct  7 13:18:05 2016 +0200| [6fc74934de1fcd82ace75dfff17605ec41c7e90d] | committer: Hendrik Leppkes

Merge commit 'dc7501e524dc3270335749302c7aa449973625f3'

* commit 'dc7501e524dc3270335749302c7aa449973625f3':
  checkasm: Issue emms after benchmarking functions

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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

 tests/checkasm/checkasm.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h
index 17374b4..7877251 100644
--- a/tests/checkasm/checkasm.h
+++ b/tests/checkasm/checkasm.h
@@ -27,6 +27,7 @@
 #include "config.h"
 #include "libavutil/avstring.h"
 #include "libavutil/cpu.h"
+#include "libavutil/internal.h"
 #include "libavutil/lfg.h"
 #include "libavutil/timer.h"
 
@@ -167,6 +168,7 @@ void checkasm_checked_call(void *func, ...);
                     tcount++;\
                 }\
             }\
+            emms_c();\
             checkasm_update_bench(tcount, tsum);\
         }\
     } while (0)


======================================================================