diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-03-03 22:27:25 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-03-03 22:27:25 +0000 |
| commit | d031764edb6050623f0e399be5a7cbc7bee76249 (patch) | |
| tree | 5712270b75712ad067ecd7c8a807c483b8f0db4a /src/xine-engine | |
| parent | b4eea697942773917c2b4c8b932e246227ba01d4 (diff) | |
| parent | bc0969908f75c641469ab46e9866c3ee3026a435 (diff) | |
| download | xine-lib-d031764edb6050623f0e399be5a7cbc7bee76249.tar.gz xine-lib-d031764edb6050623f0e399be5a7cbc7bee76249.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/libmpeg2new/include/Makefile.am => src/video_dec/libmpeg2new/include/Makefile.am
rename : src/libmpeg2new/libmpeg2/Makefile.am => src/video_dec/libmpeg2new/libmpeg2/Makefile.am
Diffstat (limited to 'src/xine-engine')
| -rw-r--r-- | src/xine-engine/demux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xine-engine/demux.c b/src/xine-engine/demux.c index 449b9f991..ba43ddc60 100644 --- a/src/xine-engine/demux.c +++ b/src/xine-engine/demux.c @@ -120,7 +120,7 @@ void _x_demux_flush_engine (xine_stream_t *stream) { } -struct timespec _x_compute_interval(unsigned int millisecs) { +static struct timespec _x_compute_interval(unsigned int millisecs) { struct timespec ts; clock_gettime(CLOCK_REALTIME, &ts); uint64_t ttimer = (uint64_t)ts.tv_sec*1000 + ts.tv_nsec/1000000 + millisecs; |