license update; whitespace cleanup

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@193 10f7b99b-c216-0410-bff0-8a66a9350fd8

1 files changed, 20 insertions, 20 deletions

diff --git a/src/apps/mplayerc/PlayerCaptureDialog.cpp b/src/apps/mplayerc/PlayerCaptureDialog.cpp
index dcc187263..62451b73f 100644
--- a/src/apps/mplayerc/PlayerCaptureDialog.cpp
+++ b/src/apps/mplayerc/PlayerCaptureDialog.cpp
@@ -1,27 +1,26 @@
-/* 

- *	Copyright (C) 2003-2006 Gabest

- *	http://www.gabest.org

+/*

+ * $Id$

+ *

+ * (C) 2003-2006 Gabest

+ * (C) 2006-2007 see AUTHORS

+ *

+ * This file is part of mplayerc.

+ *

+ * Mplayerc 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 3 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, 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 GNU Make; see the file COPYING.  If not, write to

- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 

- *  http://www.gnu.org/copyleft/gpl.html

+ * Mplayerc 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, see <http://www.gnu.org/licenses/>.

  *

  */

 

-// PlayerCaptureDialog.cpp : implementation file

-//

-

 #include "stdafx.h"

 #include "mplayerc.h"

 #include "mainfrm.h"

@@ -32,6 +31,7 @@
 #include "..\..\filters\muxer\MatroskaMuxer\MatroskaMuxer.h"

 #include "..\..\filters\muxer\DSMMuxer\DSMMuxer.h"

 

+

 static bool LoadMediaType(CStringW DisplayName, AM_MEDIA_TYPE** ppmt)

 {

 	bool fRet = false;