diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:07:09 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:57:31 +0200 |
commit | 9bcd12fdf5c6f85e9bb391caa2713021624a957e (patch) | |
tree | 375eac533ead90a45e7121e5ab307861b4ef52c8 /TOOLS/realcodecs/28_8.c | |
parent | d419ecd161634e79dab3ac57d57c4bccba2adcdc (diff) | |
parent | e0d66b140e1da7a793bff15003cadab79544b1dd (diff) | |
download | mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.bz2 mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.xz |
Merge svn changes up to r28310
The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
Diffstat (limited to 'TOOLS/realcodecs/28_8.c')
-rw-r--r-- | TOOLS/realcodecs/28_8.c | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/TOOLS/realcodecs/28_8.c b/TOOLS/realcodecs/28_8.c index 9a0ddf56d0..6634c4afde 100644 --- a/TOOLS/realcodecs/28_8.c +++ b/TOOLS/realcodecs/28_8.c @@ -1,9 +1,23 @@ /* - GPL v2 blah blah - - This is a small dll that works as a wrapper for the actual 14_4.so.6.0 - dll from real player 8.0. -*/ + * This is a small DLL that works as a wrapper for the actual real28_8.so.6.0 + * DLL from RealPlayer 8.0. + * + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ /* Assuming that RACloseCodec is the last call. @@ -30,7 +44,7 @@ int b_dlOpened=0; void *handle=NULL; /* exits program when failure */ -void loadSyms() { +void loadSyms(void) { fputs("loadSyms()\n", stderr); if (!b_dlOpened) { char *error; @@ -86,7 +100,7 @@ void loadSyms() { } } -void closeDll() { +void closeDll(void) { if (handle) { b_dlOpened=0; dlclose(handle); @@ -101,11 +115,11 @@ void _init(void) { struct timezone tz; struct timeval tv1, tv2; -void tic() { +void tic(void) { gettimeofday(&tv1, &tz); } -void toc() { +void toc(void) { long secs, usecs; gettimeofday(&tv2, &tz); secs=tv2.tv_sec-tv1.tv_sec; |