summaryrefslogtreecommitdiff
path: root/libavutil
diff options
context:
space:
mode:
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/adler32.c4
-rw-r--r--libavutil/x86/cpu.c5
2 files changed, 7 insertions, 2 deletions
diff --git a/libavutil/adler32.c b/libavutil/adler32.c
index 8ea5fc2958..f4f56ea9b6 100644
--- a/libavutil/adler32.c
+++ b/libavutil/adler32.c
@@ -61,7 +61,9 @@ unsigned long av_adler32_update(unsigned long adler, const uint8_t * buf,
#include "log.h"
#include "timer.h"
#define LEN 7001
-volatile int checksum;
+
+static volatile int checksum;
+
int main(int argc, char **argv)
{
int i;
diff --git a/libavutil/x86/cpu.c b/libavutil/x86/cpu.c
index bb3f1b325b..93df737c28 100644
--- a/libavutil/x86/cpu.c
+++ b/libavutil/x86/cpu.c
@@ -74,7 +74,10 @@ int ff_get_cpu_flags_x86(void)
return 0; /* CPUID not supported */
#endif
- cpuid(0, max_std_level, vendor.i[0], vendor.i[2], vendor.i[1]);
+ cpuid(0, max_std_level, ebx, ecx, edx);
+ vendor.i[0] = ebx;
+ vendor.i[1] = edx;
+ vendor.i[2] = ecx;
if(max_std_level >= 1){
cpuid(1, eax, ebx, ecx, std_caps);