summaryrefslogtreecommitdiffstats
path: root/liba52
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-05-08 23:50:26 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-05-08 23:50:26 +0300
commit1db1773ec27fc4e7c9d44ad02ccfa7eaf364ce07 (patch)
treec5e99bfe0e69cd37fb8ac70fadf00ce54a1cbe3c /liba52
parentf2864e9a072f53c38a04dd7c44392521777dc908 (diff)
parent86c9fb2e8930de031807513c9b93d47394d2d2fa (diff)
downloadmpv-1db1773ec27fc4e7c9d44ad02ccfa7eaf364ce07.tar.bz2
mpv-1db1773ec27fc4e7c9d44ad02ccfa7eaf364ce07.tar.xz
Merge svn changes up to r29277
Diffstat (limited to 'liba52')
-rw-r--r--liba52/test.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/liba52/test.c b/liba52/test.c
index f54ca5f836..2fb661011d 100644
--- a/liba52/test.c
+++ b/liba52/test.c
@@ -43,7 +43,7 @@ void mp_msg( int x, const char *format, ... ) // stub for cpudetect.c
}
#ifdef TIMING
-static inline long long rdtsc()
+static inline long long rdtsc(void)
{
long long l;
__asm__ volatile("rdtsc\n\t"