diff options
| -rw-r--r-- | libmpdemux/demux_lavf.c | 34 | ||||
| -rw-r--r-- | libmpdemux/demux_nemesi.c | 26 | ||||
| -rw-r--r-- | libmpdemux/demux_ty.c | 18 | ||||
| -rw-r--r-- | libmpdemux/demux_xmms.c | 19 | ||||
| -rw-r--r-- | libmpdemux/mpeg_packetizer.c | 37 | ||||
| -rw-r--r-- | libmpdemux/mpeg_packetizer.h | 37 | ||||
| -rw-r--r-- | libmpdemux/yuv4mpeg.c | 31 | ||||
| -rw-r--r-- | libmpdemux/yuv4mpeg.h | 34 |
8 files changed, 124 insertions, 112 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 48f65be76e..f1975319f5 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -1,20 +1,22 @@ /* - Copyright (C) 2004 Michael Niedermayer <michaelni@gmx.at> - - 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. - - 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. - - 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 St, Fifth Floor, Boston, MA 02110-1301 USA -*/ + * Copyright (C) 2004 Michael Niedermayer <michaelni@gmx.at> + * + * 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_nemesi.c b/libmpdemux/demux_nemesi.c index d0669631a6..6403c9de67 100644 --- a/libmpdemux/demux_nemesi.c +++ b/libmpdemux/demux_nemesi.c @@ -1,19 +1,21 @@ /* - * Copyright (C) 2007 Alessandro Molina <amol.wrk@gmail.com> + * Copyright (C) 2007 Alessandro Molina <amol.wrk@gmail.com> * - * 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 file is part of MPlayer. * - * 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. + * 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. * - * 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 + * 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 <stdlib.h> #include <stdio.h> diff --git a/libmpdemux/demux_ty.c b/libmpdemux/demux_ty.c index b985bea7d1..b63590daab 100644 --- a/libmpdemux/demux_ty.c +++ b/libmpdemux/demux_ty.c @@ -11,21 +11,21 @@ * However, no code in the following subsection is directly copied from * either author. * + * This file is part of MPlayer. * - * 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. + * 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. */ diff --git a/libmpdemux/demux_xmms.c b/libmpdemux/demux_xmms.c index e156a96bc5..7bd2f6546a 100644 --- a/libmpdemux/demux_xmms.c +++ b/libmpdemux/demux_xmms.c @@ -1,20 +1,21 @@ /* * Copyright (C) 2002-2004 Balatoni Denes and A'rpi * - * 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. + * This file is part of MPlayer. * - * This program is distributed in the hope that it will be useful, + * 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 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. */ // This is not reentrant because of global static variables, but most of diff --git a/libmpdemux/mpeg_packetizer.c b/libmpdemux/mpeg_packetizer.c index 9fa9383407..72f2fdb188 100644 --- a/libmpdemux/mpeg_packetizer.c +++ b/libmpdemux/mpeg_packetizer.c @@ -1,25 +1,28 @@ /* - * Copyright (C) 2006 Benjamin Zores - * Set of helper routines for building MPEG 1/2 PS/PES packets. + * set of helper routines for building MPEG 1/2 PS/PES packets * - * Based on various code bororwed from vo_mpegpes/vo_dxr2 : - * (C) 2000 Ralph Metzler <ralph@convergence.de> - * Marcus Metzler <marcus@convergence.de> - * Gerard Lantau + * Copyright (C) 2006 Benjamin Zores * - * 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. + * Based on code borrowed from vo_mpegpes/vo_dxr2: + * (C) 2000 Ralph Metzler <ralph@convergence.de> + * Marcus Metzler <marcus@convergence.de> + * Gerard Lantau * - * 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. + * This file is part of MPlayer. * - * 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 + * 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 <unistd.h> diff --git a/libmpdemux/mpeg_packetizer.h b/libmpdemux/mpeg_packetizer.h index f9874c840a..e193761fc1 100644 --- a/libmpdemux/mpeg_packetizer.h +++ b/libmpdemux/mpeg_packetizer.h @@ -1,25 +1,28 @@ /* - * Copyright (C) 2006 Benjamin Zores - * Set of helper routines for building MPEG 1/2 PS/PES packets. + * helper routines for building MPEG 1/2 PS/PES packets * - * Based on various code bororwed from vo_mpegpes/vo_dxr2 : - * (C) 2000 Ralph Metzler <ralph@convergence.de> - * Marcus Metzler <marcus@convergence.de> - * Gerard Lantau + * Copyright (C) 2006 Benjamin Zores * - * 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. + * based on code borrowed from vo_mpegpes/vo_dxr2: + * (C) 2000 Ralph Metzler <ralph@convergence.de> + * Marcus Metzler <marcus@convergence.de> + * Gerard Lantau * - * 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. + * This file is part of MPlayer. * - * 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 + * 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_MPEG_PACKETIZER_H diff --git a/libmpdemux/yuv4mpeg.c b/libmpdemux/yuv4mpeg.c index 04b959e9dc..43a6cb8193 100644 --- a/libmpdemux/yuv4mpeg.c +++ b/libmpdemux/yuv4mpeg.c @@ -1,25 +1,26 @@ /* - * yuv4mpeg.c: Functions for reading and writing "new" YUV4MPEG streams + * functions for reading and writing "new" YUV4MPEG streams * - * Copyright (C) 2001 Matthew J. Marjanovic <maddog@mir.com> + * Copyright (C) 2001 Matthew J. Marjanovic <maddog@mir.com> * - * This file is ripped from the lavtools package (mjpeg.sourceforge.net) - * Ported to mplayer by Rik Snel <rsnel@cube.dyndns.org> + * This file is ripped from the lavtools package (mjpeg.sourceforge.net) + * Ported to mplayer by Rik Snel <rsnel@cube.dyndns.org> * - * 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. + * This file is part of MPlayer. * - * 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. + * 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. * - * 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 + * 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/yuv4mpeg.h b/libmpdemux/yuv4mpeg.h index 3609388596..097d9cdb9e 100644 --- a/libmpdemux/yuv4mpeg.h +++ b/libmpdemux/yuv4mpeg.h @@ -1,27 +1,27 @@ /* - * yuv4mpeg.h: Functions for reading and writing "new" YUV4MPEG2 streams. + * functions for reading and writing "new" YUV4MPEG2 streams + * Stream format is described at the end of this file. * - * Stream format is described at the end of this file. + * Copyright (C) 2001 Matthew J. Marjanovic <maddog@mir.com> * + * This file is ripped from the lavtools package (mjpeg.sourceforge.net) + * Ported to mplayer by Rik Snel <rsnel@cube.dyndns.org> * - * Copyright (C) 2001 Matthew J. Marjanovic <maddog@mir.com> + * This file is part of MPlayer. * - * This file is ripped from the lavtools package (mjpeg.sourceforge.net) - * Ported to mplayer by Rik Snel <rsnel@cube.dyndns.org> + * 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 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. * - * 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. - * - * 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. */ #ifndef MPLAYER_YUV4MPEG_H |