diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-15 21:19:35 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-15 21:19:35 +0300 |
commit | a41db36b22053c2cf103899f3510f68ff5645662 (patch) | |
tree | e2e3d734a828caf8e1fbf1373d818f06c979e53d /libao2 | |
parent | 267a3f4c9c00848f32c341595d2d831157a79bee (diff) | |
parent | 84fa3d69f360c87fce4efe6acb128ad78d3647e2 (diff) | |
download | mpv-a41db36b22053c2cf103899f3510f68ff5645662.tar.bz2 mpv-a41db36b22053c2cf103899f3510f68ff5645662.tar.xz |
Merge svn changes up to r26783
Conflicts:
Makefile
common.mak
configure
libmpcodecs/vd_ffmpeg.c
libmpdemux/demux_mkv.c
libvo/vo_xv.c
mplayer.c
Diffstat (limited to 'libao2')
-rw-r--r-- | libao2/ao_dsound.c | 21 | ||||
-rw-r--r-- | libao2/ao_ivtv.c | 37 | ||||
-rw-r--r-- | libao2/ao_pulse.c | 11 | ||||
-rw-r--r-- | libao2/ao_v4l2.c | 31 | ||||
-rw-r--r-- | libao2/ao_win32.c | 22 |
5 files changed, 69 insertions, 53 deletions
diff --git a/libao2/ao_dsound.c b/libao2/ao_dsound.c index d66de37ec5..acd59983dd 100644 --- a/libao2/ao_dsound.c +++ b/libao2/ao_dsound.c @@ -1,22 +1,25 @@ -/****************************************************************************** - * ao_dsound.c: Windows DirectSound interface for MPlayer +/* + * Windows DirectSound interface + * * Copyright (c) 2004 Gabor Szecsi <deje@miki.hu> * - * This program is free software; you can redistribute it and/or modify + * 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. * - * This program is distributed in the hope that it will be useful, + * 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 this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - *****************************************************************************/ + * 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. + */ + /** \todo verify/extend multichannel support */ diff --git a/libao2/ao_ivtv.c b/libao2/ao_ivtv.c index ea57bcf9c4..4d1d578ba0 100644 --- a/libao2/ao_ivtv.c +++ b/libao2/ao_ivtv.c @@ -1,25 +1,28 @@ /* - * Copyright (C) 2006 Benjamin Zores - * Audio output for WinTV PVR-150/250/350 (a.k.a IVTV) cards. - * through Connexant hardware MPEG decoder. - * See http://ivtvdriver.org/index.php/Main_Page for more details on the - * cards supported by the ivtv driver. + * audio output for WinTV PVR-150/250/350 (a.k.a IVTV) cards + * through Connexant hardware MPEG decoder + * See http://ivtvdriver.org/index.php/Main_Page for more details on the + * cards supported by the ivtv driver. * - * This program 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. + * WARNING: You need to force -ac hwmpa for audio output to work. * - * This program 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. + * Copyright (C) 2006 Benjamin Zores * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * This file is part of MPlayer. * - * WARNING: you need to force -ac hwmpa for audio output to work. + * 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 <inttypes.h> diff --git a/libao2/ao_pulse.c b/libao2/ao_pulse.c index 5140a5e5c5..827dab92db 100644 --- a/libao2/ao_pulse.c +++ b/libao2/ao_pulse.c @@ -15,10 +15,11 @@ * 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 + * 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 <string.h> #include <pulse/pulseaudio.h> @@ -116,10 +117,14 @@ static const struct format_map_s { } format_maps[] = { {AF_FORMAT_S16_LE, PA_SAMPLE_S16LE}, {AF_FORMAT_S16_BE, PA_SAMPLE_S16BE}, +#ifdef PA_SAMPLE_S32NE {AF_FORMAT_S32_LE, PA_SAMPLE_S32LE}, {AF_FORMAT_S32_BE, PA_SAMPLE_S32BE}, +#endif +#ifdef PA_SAMPLE_FLOAT32NE {AF_FORMAT_FLOAT_LE, PA_SAMPLE_FLOAT32LE}, {AF_FORMAT_FLOAT_BE, PA_SAMPLE_FLOAT32BE}, +#endif {AF_FORMAT_U8, PA_SAMPLE_U8}, {AF_FORMAT_MU_LAW, PA_SAMPLE_ULAW}, {AF_FORMAT_A_LAW, PA_SAMPLE_ALAW}, diff --git a/libao2/ao_v4l2.c b/libao2/ao_v4l2.c index 6dca333c1d..dc63003b06 100644 --- a/libao2/ao_v4l2.c +++ b/libao2/ao_v4l2.c @@ -1,22 +1,25 @@ /* - * Copyright (C) 2007 Benjamin Zores - * Audio output for V4L2 hardware MPEG decoders. + * audio output for V4L2 hardware MPEG decoders * - * This program 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. + * WARNING: You need to force -ac hwmpa for audio output to work. * - * This program 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. + * Copyright (C) 2007 Benjamin Zores * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * This file is part of MPlayer. * - * WARNING: you need to force -ac hwmpa for audio output to work. + * 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 <inttypes.h> diff --git a/libao2/ao_win32.c b/libao2/ao_win32.c index 71146b43a2..40830eb233 100644 --- a/libao2/ao_win32.c +++ b/libao2/ao_win32.c @@ -1,22 +1,24 @@ -/****************************************************************************** - * ao_win32.c: Windows waveOut interface for MPlayer - * Copyright (c) 2002 - 2004 Sascha Sommer <saschasommer@freenet.de>. +/* + * Windows waveOut interface * - * This program is free software; you can redistribute it and/or modify + * Copyright (c) 2002 - 2004 Sascha Sommer <saschasommer@freenet.de> + * + * 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. * - * This program is distributed in the hope that it will be useful, + * 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 this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - *****************************************************************************/ + * 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> |