diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-07 02:06:48 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-07 02:07:11 +0300 |
commit | 6d908205fbadbdf7ccdc6c5e0eb918f0b43f16e0 (patch) | |
tree | 09a6acada909bd5d070ace54209cadeae66d15cf /libmpdemux | |
parent | e306174952d42e1cd6cc5efc50ae6bb0410501bc (diff) | |
parent | eafe5b7517bbf408ae1ffc936a3abe2313c3b334 (diff) | |
download | mpv-6d908205fbadbdf7ccdc6c5e0eb918f0b43f16e0.tar.bz2 mpv-6d908205fbadbdf7ccdc6c5e0eb918f0b43f16e0.tar.xz |
Merge svn changes up to r29304
Diffstat (limited to 'libmpdemux')
64 files changed, 1210 insertions, 146 deletions
diff --git a/libmpdemux/asf.h b/libmpdemux/asf.h index 1e6210e603..b97089bc15 100644 --- a/libmpdemux/asf.h +++ b/libmpdemux/asf.h @@ -1,3 +1,21 @@ +/* + * 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. + */ + #ifndef MPLAYER_ASF_H #define MPLAYER_ASF_H diff --git a/libmpdemux/asfheader.c b/libmpdemux/asfheader.c index 93f47877bc..c08ed17064 100644 --- a/libmpdemux/asfheader.c +++ b/libmpdemux/asfheader.c @@ -1,5 +1,22 @@ -// .asf fileformat docs from http://divx.euro.ru +/* + * 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. + */ +// .asf fileformat docs from http://divx.euro.ru #include <stdio.h> #include <stdlib.h> diff --git a/libmpdemux/aviheader.c b/libmpdemux/aviheader.c index 516da9d0f8..3657e914b2 100644 --- a/libmpdemux/aviheader.c +++ b/libmpdemux/aviheader.c @@ -1,3 +1,20 @@ +/* + * 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> diff --git a/libmpdemux/aviheader.h b/libmpdemux/aviheader.h index 2fd81d248a..66acc8fc3d 100644 --- a/libmpdemux/aviheader.h +++ b/libmpdemux/aviheader.h @@ -1,3 +1,21 @@ +/* + * 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. + */ + #ifndef MPLAYER_AVIHEADER_H #define MPLAYER_AVIHEADER_H diff --git a/libmpdemux/aviprint.c b/libmpdemux/aviprint.c index 35af2ffbdf..00461f6c9f 100644 --- a/libmpdemux/aviprint.c +++ b/libmpdemux/aviprint.c @@ -1,3 +1,20 @@ +/* + * 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> diff --git a/libmpdemux/demux_aac.c b/libmpdemux/demux_aac.c index 88d9204615..ee9f1e935e 100644 --- a/libmpdemux/demux_aac.c +++ b/libmpdemux/demux_aac.c @@ -1,3 +1,21 @@ +/* + * 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> #include <string.h> diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c index b8be24f965..297c2018cb 100644 --- a/libmpdemux/demux_asf.c +++ b/libmpdemux/demux_asf.c @@ -1,4 +1,23 @@ -// ASF file parser for DEMUXER v0.3 by A'rpi/ESP-team +/* + * ASF file parser for DEMUXER v0.3 + * copyright (c) 2001 A'rpi/ESP-team + * + * 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> diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c index d374e3d130..da395fb611 100644 --- a/libmpdemux/demux_audio.c +++ b/libmpdemux/demux_audio.c @@ -1,3 +1,20 @@ +/* + * 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 "config.h" #include "mp_msg.h" diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c index 8ef549cf42..197076adbe 100644 --- a/libmpdemux/demux_avi.c +++ b/libmpdemux/demux_avi.c @@ -1,4 +1,23 @@ -// AVI file parser for DEMUXER v2.9 by A'rpi/ESP-team +/* + * AVI file parser for DEMUXER v2.9 + * Copyright (c) 2001 A'rpi/ESP-team + * + * 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> diff --git a/libmpdemux/demux_demuxers.c b/libmpdemux/demux_demuxers.c index 156251c33a..3d4c000bf4 100644 --- a/libmpdemux/demux_demuxers.c +++ b/libmpdemux/demux_demuxers.c @@ -1,3 +1,20 @@ +/* + * 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 "config.h" #include "mp_msg.h" diff --git a/libmpdemux/demux_film.c b/libmpdemux/demux_film.c index c310f3bd18..81b93fb4c4 100644 --- a/libmpdemux/demux_film.c +++ b/libmpdemux/demux_film.c @@ -1,14 +1,29 @@ /* - FILM file parser for the MPlayer program - by Mike Melanson - - This demuxer handles FILM (a.k.a. CPK) files commonly found on - Sega Saturn CD-ROM games. FILM files have also been found on 3DO - games. - - Details of the FILM file format can be found at: - http://www.pcisys.net/~melanson/codecs/ -*/ + * FILM file parser + * Copyright (C) 2002 Mike Melanson + * + * This demuxer handles FILM (a.k.a. CPK) files commonly found on Sega + * Saturn CD-ROM games. FILM files have also been found on 3DO games. + * + * details of the FILM file format can be found at: + * http://www.pcisys.net/~melanson/codecs/ + * + * 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> diff --git a/libmpdemux/demux_fli.c b/libmpdemux/demux_fli.c index 37fa4d4559..bc00f4c0c2 100644 --- a/libmpdemux/demux_fli.c +++ b/libmpdemux/demux_fli.c @@ -1,7 +1,23 @@ /* - FLI file parser for the MPlayer program - by Mike Melanson -*/ + * FLI file parser + * copyright (c) 2001 Mike Melanson + * + * 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> diff --git a/libmpdemux/demux_gif.c b/libmpdemux/demux_gif.c index 99aa134d92..419055896d 100644 --- a/libmpdemux/demux_gif.c +++ b/libmpdemux/demux_gif.c @@ -1,7 +1,23 @@ /* - GIF file parser for MPlayer - by Joey Parrish -*/ + * GIF file parser + * Copyright (C) 2003 Joey Parrish + * + * 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> diff --git a/libmpdemux/demux_lmlm4.c b/libmpdemux/demux_lmlm4.c index 9b4382ba5a..9bd770adf3 100644 --- a/libmpdemux/demux_lmlm4.c +++ b/libmpdemux/demux_lmlm4.c @@ -1,7 +1,23 @@ /* - LMLM4 MPEG4 Compression Card stream & file parser by Maxim Yevtyushkin <max@linuxmedialabs.com> - Based on SMJPEG file parser by Alex Beregszaszi - + * LMLM4 MPEG4 Compression Card stream & file parser + * Copyright (C) 2003 Maxim Yevtyushkin <max@linuxmedialabs.com> + * based on SMJPEG file parser by Alex Beregszaszi + * + * 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> diff --git a/libmpdemux/demux_mf.c b/libmpdemux/demux_mf.c index dc990c0b8f..4f6f78c942 100644 --- a/libmpdemux/demux_mf.c +++ b/libmpdemux/demux_mf.c @@ -1,3 +1,20 @@ +/* + * 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> diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index c8dfd92ba1..d4ba0d0227 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -1,9 +1,24 @@ /* - * native Matroska demuxer - * Written by Aurelien Jacobs <aurel@gnuage.org> + * Matroska demuxer + * Copyright (C) 2004 Aurelien Jacobs <aurel@gnuage.org> * Based on the one written by Ronald Bultje for gstreamer - * and on demux_mkv.cpp from Moritz Bunkus. - * Licence: GPL + * and on demux_mkv.cpp from Moritz Bunkus. + * + * 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 "config.h" diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index bb05aaeae0..e345598469 100644 --- a/libmpdemux/demux_mov.c +++ b/ |