# HG changeset patch # User diego # Date 1210785773 0 # Node ID 2a34d9fa52abefa0581d4c6479253bc3abad8b73 # Parent 588ce97b44f2191d37c8295fa175cbe467a7542d Use standard license headers with standard formatting. diff -r 588ce97b44f2 -r 2a34d9fa52ab libvo/jpeg_enc.c --- a/libvo/jpeg_enc.c Wed May 14 17:21:58 2008 +0000 +++ b/libvo/jpeg_enc.c Wed May 14 17:22:53 2008 +0000 @@ -1,25 +1,28 @@ -/* Straightforward (to be) optimized JPEG encoder for the YUV422 format - * based on mjpeg code from ffmpeg. +/* + * straightforward (to be) optimized JPEG encoder for the YUV422 format + * based on MJPEG code from FFmpeg + * + * For an excellent introduction to the JPEG format, see: + * http://www.ece.purdue.edu/~bouman/grad-labs/lab8/pdf/lab.pdf * * Copyright (c) 2002, Rik Snel - * Parts from ffmpeg Copyright (c) 2000-2002 Fabrice Bellard + * parts from FFmpeg Copyright (c) 2000-2002 Fabrice Bellard * - * 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 - * - * For an excellent introduction to the JPEG format, see: - * http://www.ece.purdue.edu/~bouman/grad-labs/lab8/pdf/lab.pdf + * 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 -r 588ce97b44f2 -r 2a34d9fa52ab libvo/jpeg_enc.h --- a/libvo/jpeg_enc.h Wed May 14 17:21:58 2008 +0000 +++ b/libvo/jpeg_enc.h Wed May 14 17:22:53 2008 +0000 @@ -1,25 +1,28 @@ -/* Straightforward (to be) optimized JPEG encoder for the YUV422 format - * based on mjpeg code from ffmpeg. +/* + * straightforward (to be) optimized JPEG encoder for the YUV422 format + * based on MJPEG code from FFmpeg + * + * For an excellent introduction to the JPEG format, see: + * http://www.ece.purdue.edu/~bouman/grad-labs/lab8/pdf/lab.pdf * * Copyright (c) 2002, Rik Snel - * Parts from ffmpeg Copyright (c) 2000-2002 Fabrice Bellard + * parts from FFmpeg Copyright (c) 2000-2002 Fabrice Bellard * - * 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 - * - * For an excellent introduction to the JPEG format, see: - * http://www.ece.purdue.edu/~bourman/grad-labs/lab8/pdf/lab.pdf + * 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_JPEG_ENC_H diff -r 588ce97b44f2 -r 2a34d9fa52ab libvo/spuenc.c --- a/libvo/spuenc.c Wed May 14 17:21:58 2008 +0000 +++ b/libvo/spuenc.c Wed May 14 17:22:53 2008 +0000 @@ -9,20 +9,21 @@ * * Samuel Hocevar and Michel Lespinasse * - * 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 St, 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 diff -r 588ce97b44f2 -r 2a34d9fa52ab libvo/spuenc.h --- a/libvo/spuenc.h Wed May 14 17:21:58 2008 +0000 +++ b/libvo/spuenc.h Wed May 14 17:22:53 2008 +0000 @@ -3,20 +3,21 @@ * * Copyright (C) 2000 Alejandro J. Cura * - * 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 St, 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_SPUENC_H diff -r 588ce97b44f2 -r 2a34d9fa52ab libvo/video_out_internal.h --- a/libvo/video_out_internal.h Wed May 14 17:21:58 2008 +0000 +++ b/libvo/video_out_internal.h Wed May 14 17:22:53 2008 +0000 @@ -1,23 +1,21 @@ /* - * video_out_internal.h + * Copyright (C) Aaron Holtzman - Aug 1999 * - * Copyright (C) Aaron Holtzman - Aug 1999 + * This file is part of MPlayer. * - * This file is part of mpeg2dec, a free MPEG-2 video stream decoder. - * - * mpeg2dec 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, or (at your option) - * any later version. - * - * mpeg2dec 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 mpeg2dec; 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_VIDEO_OUT_INTERNAL_H diff -r 588ce97b44f2 -r 2a34d9fa52ab libvo/vo_3dfx.c --- a/libvo/vo_3dfx.c Wed May 14 17:21:58 2008 +0000 +++ b/libvo/vo_3dfx.c Wed May 14 17:22:53 2008 +0000 @@ -1,24 +1,24 @@ -/* - * video_out_3dfx.c +/* + * video_out_3dfx.c + * Heavily based on video_out_mga.c of Aaron Holtzman's mpeg2dec. * - * Copyright (C) Colin Cross Apr 2000 + * Copyright (C) Colin Cross Apr 2000 + * + * This file is part of MPlayer. * - * This file heavily based off of video_out_mga.c of Aaron Holtzman's - * mpeg2dec - * - * mpeg2dec 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, or (at your option) - * any later version. - * - * mpeg2dec 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 mpeg2dec; 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 diff -r 588ce97b44f2 -r 2a34d9fa52ab libvo/vo_directx.c --- a/libvo/vo_directx.c Wed May 14 17:21:58 2008 +0000 +++ b/libvo/vo_directx.c Wed May 14 17:22:53 2008 +0000 @@ -1,22 +1,24 @@ -/****************************************************************************** - * vo_directx.c: Directx v2 or later DirectDraw interface for MPlayer - * Copyright (c) 2002 - 2005 Sascha Sommer . +/* + * Directx v2 or later DirectDraw interface * - * This program is free software; you can redistribute it and/or modify + * Copyright (c) 2002 - 2005 Sascha Sommer + * + * 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 #include diff -r 588ce97b44f2 -r 2a34d9fa52ab libvo/vo_ivtv.c --- a/libvo/vo_ivtv.c Wed May 14 17:21:58 2008 +0000 +++ b/libvo/vo_ivtv.c Wed May 14 17:22:53 2008 +0000 @@ -1,24 +1,27 @@ /* - * Copyright (C) 2006 Benjamin Zores - * Video output for WinTV PVR-150/250/350 (a.k.a IVTV) cards. - * TV-Out through hardware MPEG decoder. - * Based on some old code from ivtv driver authors. - * See http://ivtvdriver.org/index.php/Main_Page for more details on the - * cards supported by the ivtv driver. + * video output for WinTV PVR-150/250/350 (a.k.a IVTV) cards + * TV-Out through hardware MPEG decoder + * Based on some old code from ivtv driver authors. + * See http://ivtvdriver.org/index.php/Main_Page for more details on the + * cards supported by the ivtv driver. + * + * Copyright (C) 2006 Benjamin Zores + * + * 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" diff -r 588ce97b44f2 -r 2a34d9fa52ab libvo/vo_jpeg.c --- a/libvo/vo_jpeg.c Wed May 14 17:21:58 2008 +0000 +++ b/libvo/vo_jpeg.c Wed May 14 17:22:53 2008 +0000 @@ -1,26 +1,25 @@ -/* ------------------------------------------------------------------------- */ - -/* - * vo_jpeg.c, JPEG Renderer for MPlayer +/* + * JPEG Renderer for MPlayer * * Copyright (C) 2002 by Pontscho * Copyright (C) 2003 by Alex * Copyright (C) 2004, 2005 by Ivo van Poorten * - * 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. */ /* ------------------------------------------------------------------------- */ diff -r 588ce97b44f2 -r 2a34d9fa52ab libvo/vo_md5sum.c --- a/libvo/vo_md5sum.c Wed May 14 17:21:58 2008 +0000 +++ b/libvo/vo_md5sum.c Wed May 14 17:22:53 2008 +0000 @@ -1,24 +1,25 @@ /* ------------------------------------------------------------------------- */ -/* - * vo_md5sum.c, md5sum Video Output Driver for MPlayer +/* + * md5sum video output driver * * Written by Ivo van Poorten. (C) Copyright 2004, 2005, 2006. * - * 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. */ /* ------------------------------------------------------------------------- */ diff -r 588ce97b44f2 -r 2a34d9fa52ab libvo/vo_null.c --- a/libvo/vo_null.c Wed May 14 17:21:58 2008 +0000 +++ b/libvo/vo_null.c Wed May 14 17:22:53 2008 +0000 @@ -1,23 +1,23 @@ -/* - * video_out_null.c +/* + * based on video_out_null.c from mpeg2dec * - * Copyright (C) Aaron Holtzman - June 2000 + * Copyright (C) Aaron Holtzman - June 2000 + * + * This file is part of MPlayer. * - * This file is part of mpeg2dec, a free MPEG-2 video stream decoder. - * - * mpeg2dec 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, or (at your option) - * any later version. - * - * mpeg2dec 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 mpeg2dec; 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 diff -r 588ce97b44f2 -r 2a34d9fa52ab libvo/vo_pnm.c --- a/libvo/vo_pnm.c Wed May 14 17:21:58 2008 +0000 +++ b/libvo/vo_pnm.c Wed May 14 17:22:53 2008 +0000 @@ -1,24 +1,23 @@ -/* ------------------------------------------------------------------------- */ - -/* - * vo_pnm.c, PPM/PGM/PGMYUV Video Output Driver for MPlayer +/* + * PPM/PGM/PGMYUV video output driver * * Written by Ivo van Poorten. (C) Copyright 2004, 2005. * - * 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. */ /* ------------------------------------------------------------------------- */ diff -r 588ce97b44f2 -r 2a34d9fa52ab libvo/vo_sdl.c --- a/libvo/vo_sdl.c Wed May 14 17:21:58 2008 +0000 +++ b/libvo/vo_sdl.c Wed May 14 17:22:53 2008 +0000 @@ -23,23 +23,23 @@ * and BeOS support, too. Yay. SDL info, source, and binaries can be found * at http://slouken.devolution.com/SDL/ * - * This file is part of mpeg2dec, a free MPEG-2 video stream decoder. - * - * mpeg2dec 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, or (at your option) - * any later version. - * - * mpeg2dec 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 mpeg2dec; see the file COPYING. If not, write to - * the Free Software Foundation. + * -- end old disclaimer -- + * + * 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. * - * -- end old disclaimer -- + * 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. */ /* define to force software-surface (video surface stored in system memory)*/ diff -r 588ce97b44f2 -r 2a34d9fa52ab libvo/vo_v4l2.c --- a/libvo/vo_v4l2.c Wed May 14 17:21:58 2008 +0000 +++ b/libvo/vo_v4l2.c Wed May 14 17:22:53 2008 +0000 @@ -1,20 +1,23 @@ /* - * Copyright (C) 2007 Benjamin Zores - * Video output for V4L2 hardware MPEG decoders. + * video 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. + * Copyright (C) 2007 Benjamin Zores + * + * 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 -r 588ce97b44f2 -r 2a34d9fa52ab libvo/vo_xvr100.c --- a/libvo/vo_xvr100.c Wed May 14 17:21:58 2008 +0000 +++ b/libvo/vo_xvr100.c Wed May 14 17:22:53 2008 +0000 @@ -28,10 +28,9 @@ * 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