Mercurial > mplayer.hg

changeset 26742:0c1db5fd3f79

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use standard license headers with standard formatting.
author diego
date Wed, 14 May 2008 18:01:51 +0000
parents fc28868e5430
children 0f42fb42843c
files libmpdemux/demux_lavf.c libmpdemux/demux_nemesi.c libmpdemux/demux_ty.c libmpdemux/demux_xmms.c libmpdemux/mpeg_packetizer.c libmpdemux/mpeg_packetizer.h libmpdemux/yuv4mpeg.c libmpdemux/yuv4mpeg.h
diffstat 8 files changed, 126 insertions(+), 114 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_lavf.c	Wed May 14 17:28:50 2008 +0000
+++ b/libmpdemux/demux_lavf.c	Wed May 14 18:01:51 2008 +0000
@@ -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>
--- a/libmpdemux/demux_nemesi.c	Wed May 14 17:28:50 2008 +0000
+++ b/libmpdemux/demux_nemesi.c	Wed May 14 18:01:51 2008 +0000
@@ -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>
--- a/libmpdemux/demux_ty.c	Wed May 14 17:28:50 2008 +0000
+++ b/libmpdemux/demux_ty.c	Wed May 14 18:01:51 2008 +0000
@@ -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.
  */
 
 
--- a/libmpdemux/demux_xmms.c	Wed May 14 17:28:50 2008 +0000
+++ b/libmpdemux/demux_xmms.c	Wed May 14 18:01:51 2008 +0000
@@ -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
--- a/libmpdemux/mpeg_packetizer.c	Wed May 14 17:28:50 2008 +0000
+++ b/libmpdemux/mpeg_packetizer.c	Wed May 14 18:01:51 2008 +0000
@@ -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
+ *
+ * Copyright (C) 2006 Benjamin Zores
  *
- *   Based on various code bororwed from vo_mpegpes/vo_dxr2 :
- *      (C) 2000 Ralph Metzler <ralph@convergence.de>
- *               Marcus Metzler <marcus@convergence.de>
- *               Gerard Lantau
+ * Based on code borrowed from vo_mpegpes/vo_dxr2:
+ *    (C) 2000 Ralph Metzler <ralph@convergence.de>
+ *             Marcus Metzler <marcus@convergence.de>
+ *             Gerard Lantau
+ *
+ * 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,
- *  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 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 <unistd.h>
--- a/libmpdemux/mpeg_packetizer.h	Wed May 14 17:28:50 2008 +0000
+++ b/libmpdemux/mpeg_packetizer.h	Wed May 14 18:01:51 2008 +0000
@@ -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
+ *
+ * Copyright (C) 2006 Benjamin Zores
  *
- *   Based on various code bororwed from vo_mpegpes/vo_dxr2 :
- *      (C) 2000 Ralph Metzler <ralph@convergence.de>
- *               Marcus Metzler <marcus@convergence.de>
- *               Gerard Lantau
+ * based on code borrowed from vo_mpegpes/vo_dxr2:
+ *    (C) 2000 Ralph Metzler <ralph@convergence.de>
+ *             Marcus Metzler <marcus@convergence.de>
+ *             Gerard Lantau
+ *
+ * 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,
- *  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 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_MPEG_PACKETIZER_H
--- a/libmpdemux/yuv4mpeg.c	Wed May 14 17:28:50 2008 +0000
+++ b/libmpdemux/yuv4mpeg.c	Wed May 14 18:01:51 2008 +0000
@@ -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 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,
- *  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 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 "config.h"
--- a/libmpdemux/yuv4mpeg.h	Wed May 14 17:28:50 2008 +0000
+++ b/libmpdemux/yuv4mpeg.h	Wed May 14 18:01:51 2008 +0000
@@ -1,27 +1,27 @@
 /*
- *  yuv4mpeg.h:  Functions for reading and writing "new" YUV4MPEG2 streams.
- *
- *               Stream format is described at the end of this file.
+ * functions for reading and writing "new" YUV4MPEG2 streams
+ * Stream format is described at the end of this file.
  *
- *
- *  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 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,
- *  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 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