This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h | |
index 5949dfe..29ea584 100644 | |
--- a/libavcodec/x86/mathops.h | |
+++ b/libavcodec/x86/mathops.h | |
@@ -28,10 +28,18 @@ | |
#if ARCH_X86_32 | |
#define MULL(ra, rb, shift) \ | |
({ int rt, dummy; __asm__ (\ | |
+ if (__builtin_constant_p(shift)) | |
"imull %3 \n\t"\ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/CMakeLists.txt.orig b/CMakeLists.txt | |
index c2ce80f..f268a4b 100644 | |
--- a/CMakeLists.txt.orig | |
+++ b/CMakeLists.txt | |
@@ -130,18 +130,18 @@ set(CMAKE_VERBOSE_MAKEFILE ON) | |
#FFMPEG_FIND(LIBAVUTIL avutil avutil.h) | |
#FFMPEG_FIND(LIBSWSCALE swscale swscale.h) | |
-SET(FFMPEG_FOUND "NO") | |
-IF (FFMPEG_LIBAVFORMAT_FOUND AND |