From 4adf8975a1f71570518721ad5806ab55d392fbf9 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 14 May 2008 18:01:51 +0000 Subject: Use standard license headers with standard formatting. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26774 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/yuv4mpeg.h | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'libmpdemux/yuv4mpeg.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 * + * This file is ripped from the lavtools package (mjpeg.sourceforge.net) + * Ported to mplayer by Rik Snel * - * Copyright (C) 2001 Matthew J. Marjanovic + * This file is part of MPlayer. * - * This file is ripped from the lavtools package (mjpeg.sourceforge.net) - * Ported to mplayer by Rik Snel + * 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 -- cgit v1.2.3 From 0c6e4c6dbdae7c854e7bef99fa88c88f96a3030b Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 14 May 2008 18:11:45 +0000 Subject: 10l: Revert license header cleanup on imported files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26776 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/yuv4mpeg.h | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'libmpdemux/yuv4mpeg.h') diff --git a/libmpdemux/yuv4mpeg.h b/libmpdemux/yuv4mpeg.h index 097d9cdb9e..3609388596 100644 --- a/libmpdemux/yuv4mpeg.h +++ b/libmpdemux/yuv4mpeg.h @@ -1,27 +1,27 @@ /* - * functions for reading and writing "new" YUV4MPEG2 streams - * Stream format is described at the end of this file. + * yuv4mpeg.h: Functions for reading and writing "new" YUV4MPEG2 streams. * - * Copyright (C) 2001 Matthew J. Marjanovic + * Stream format is described at the end of this file. * - * This file is ripped from the lavtools package (mjpeg.sourceforge.net) - * Ported to mplayer by Rik Snel * - * This file is part of MPlayer. + * Copyright (C) 2001 Matthew J. Marjanovic * - * 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 ripped from the lavtools package (mjpeg.sourceforge.net) + * Ported to mplayer by Rik Snel * - * 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 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. + * 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 */ #ifndef MPLAYER_YUV4MPEG_H -- cgit v1.2.3 From c733664aaf912d7846b4ff138e684048ad8a1b34 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 14 May 2008 18:16:38 +0000 Subject: Mark files that were imported from the MJPEG Tools suite as such. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26777 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/yuv4mpeg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libmpdemux/yuv4mpeg.h') diff --git a/libmpdemux/yuv4mpeg.h b/libmpdemux/yuv4mpeg.h index 3609388596..87b71140ea 100644 --- a/libmpdemux/yuv4mpeg.h +++ b/libmpdemux/yuv4mpeg.h @@ -6,7 +6,7 @@ * * Copyright (C) 2001 Matthew J. Marjanovic * - * This file is ripped from the lavtools package (mjpeg.sourceforge.net) + * This file is part of the MJPEG Tools package (mjpeg.sourceforge.net). * Ported to mplayer by Rik Snel * * This program is free software; you can redistribute it and/or -- cgit v1.2.3