diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-09 00:05:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-09 00:05:51 +0100 |
| commit | 25b9eef410f4a737250dcf2d17b65f6c0c39cd6a (patch) | |
| tree | a1a8c88aca0b5a88a6fd0c2e9ac1008698f34fea /libavutil | |
| parent | b229485f1ad38162927b235a359b98ff5a0dc13a (diff) | |
| parent | 6b60a4c9c94bbe03afc8e0851197d97d96f644e5 (diff) | |
| download | ffmpeg-25b9eef410f4a737250dcf2d17b65f6c0c39cd6a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
cljr: K&R cosmetics
cljr: return a more sensible value when encountering invalid headers
cljr: drop unnecessary emms_c() calls without MMX code
cljr: remove useless casts
cljr: group encode/decode parts under single ifdefs
cljr: remove stray semicolon
cljr: add missing return statement in decode_end()
doc: add pulseaudio to the input list
avconv: remove unsubstantiated comment
shorten: avoid abort() on unknown audio types
cljr: add encoder
build: merge lists of HTML documentation targets
tests/examples: Mark some variables only used within their files as static.
tests/tools/examples: Replace direct exit() calls by return.
x86 cpuid: set vendor union members separately
cljr: release picture at end of decoding
rv40: NEON optimised rv40 qpel motion compensation
Conflicts:
doc/examples/muxing.c
libavcodec/cljr.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/adler32.c | 4 | ||||
| -rw-r--r-- | libavutil/x86/cpu.c | 5 |
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); |