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 /libaf/af_format.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 'libaf/af_format.c')
-rw-r--r-- | libaf/af_format.c | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/libaf/af_format.c b/libaf/af_format.c index bc6830ab58..fdac68147e 100644 --- a/libaf/af_format.c +++ b/libaf/af_format.c @@ -1,10 +1,24 @@ -/* This audio output filter changes the format of a data block. Valid - formats are: AFMT_U8, AFMT_S8, AFMT_S16_LE, AFMT_S16_BE - AFMT_U16_LE, AFMT_U16_BE, AFMT_S32_LE and AFMT_S32_BE. -*/ - -// Must be defined before any libc headers are included! -#define _ISOC9X_SOURCE +/* + * This audio filter changes the format of a data block. Valid + * formats are: AFMT_U8, AFMT_S8, AFMT_S16_LE, AFMT_S16_BE + * AFMT_U16_LE, AFMT_U16_BE, AFMT_S32_LE and AFMT_S32_BE. + * + * 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. + */ #include <stdio.h> #include <stdlib.h> @@ -29,8 +43,8 @@ long int lrintf(float); /* The below includes retrieves functions for converting to and from ulaw and alaw */ -#include "af_format_ulaw.c" -#include "af_format_alaw.c" +#include "af_format_ulaw.h" +#include "af_format_alaw.h" // Switch endianness static void endian(void* in, void* out, int len, int bps); |