* backport r11324 and r11325

diff --git a/mozilla/npvlc_rc.rc b/mozilla/npvlc_rc.rc
index dab938792575b26d4d5a2cca45b077f25d01831f..91de28d74a9db6c638b98f6a54144a2c67dbec02 100644 (file)
--- a/mozilla/npvlc_rc.rc
+++ b/mozilla/npvlc_rc.rc
@@ -38,7 +38,7 @@ BEGIN
             VALUE "FileDescription", "VLC multimedia plugin Version "STRINGIFY( VERSION )"<br><br>VideoLAN WWW: <a href=""http://www.videolan.org/"">http://www.videolan.org/</a>\0"
             VALUE "InternalName", "npvlc\0"
             VALUE "CompanyName", "VideoLAN Team\0"
-            VALUE "LegalCopyright", "Copyright VideoLAN \251 1996-2004\0"
+            VALUE "LegalCopyright", "Copyright VideoLAN \251 1996-2005\0"
             VALUE "MIMEType", "audio/mpeg|audio/x-mpeg|video/mpeg|video/x-mpeg|video/mpeg-system|video/x-mpeg-system|video/mpeg4|audio/mpeg4|application/mpeg4-iod|application/mpeg4-muxcodetable|video/x-msvideo|video/quicktime|application/x-ogg|application/x-vlc-plugin|video/x-ms-asf-plugin|video/x-ms-asf|application/x-mplayer2|video/x-ms-wmv\0"
             VALUE "FileExtents", "mp2,mp3,mpga,mpega|mp2,mp3,mpga,mpega|mpg,mpeg,mpe|mpg,mpeg,mpe|mpg,mpeg,vob|mpg,mpeg,vob|mp4,mpg4|mp4,mpg4|mp4,mpg4|mp4,mpg4|avi|mov,qt|ogg|\0"
             VALUE "FileOpenName", "MPEG audio|MPEG audio|MPEG video|MPEG video|MPEG video|MPEG video|MPEG-4 video|MPEG-4 audio|MPEG-4 video|MPEG-4 video|AVI video|QuickTime video|Ogg stream|VLC plugin\0"

diff --git a/mozilla/vlcpeer.cpp b/mozilla/vlcpeer.cpp
index 9c2a0172aa8fd84498641ac8e7e7916ae57b1781..b43d87b03b6ffce63f0e124d6ee96c5997138d52 100644 (file)
--- a/mozilla/vlcpeer.cpp
+++ b/mozilla/vlcpeer.cpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * vlcpeer.cpp: scriptable peer descriptor
  *****************************************************************************
- * Copyright (C) 2002 VideoLAN
+ * Copyright (C) 2002-2005 VideoLAN
  * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>

diff --git a/mozilla/vlcpeer.h b/mozilla/vlcpeer.h
index a078dbe0f74c59559966906553a2464081ce7bc2..def7259cf7b74ba2fb1994837cfa5c472e4b12fc 100644 (file)
--- a/mozilla/vlcpeer.h
+++ b/mozilla/vlcpeer.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * vlcpeer.h: scriptable peer descriptor
  *****************************************************************************
- * Copyright (C) 2002 VideoLAN
+ * Copyright (C) 2002-2005 VideoLAN
  * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>

diff --git a/mozilla/vlcplugin.cpp b/mozilla/vlcplugin.cpp
index 948755be25871be852e6c0573d6a25de33dab047..5d81a2f7e5ad058cd0fcf99b5adc10463422a92d 100644 (file)
--- a/mozilla/vlcplugin.cpp
+++ b/mozilla/vlcplugin.cpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * vlcplugin.cpp: a VLC plugin for Mozilla
  *****************************************************************************
- * Copyright (C) 2002 VideoLAN
+ * Copyright (C) 2002-2005 VideoLAN
  * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>

diff --git a/mozilla/vlcplugin.h b/mozilla/vlcplugin.h
index 0348298a4cb432a6999e5ca52dd4da5d9c2d9e0b..ae7873ff02d918372d691c8a7a59c0ffc75006b9 100644 (file)
--- a/mozilla/vlcplugin.h
+++ b/mozilla/vlcplugin.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * vlcplugin.h: a VLC plugin for Mozilla
  *****************************************************************************
- * Copyright (C) 2002 VideoLAN
+ * Copyright (C) 2002-2005 VideoLAN
  * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>

diff --git a/mozilla/vlcshell.cpp b/mozilla/vlcshell.cpp
index 13d088b0d3181479cbc34dba50dfe0521985630d..fcf2c635159703ad7dc62e564e3b9bbe83952dda 100644 (file)
--- a/mozilla/vlcshell.cpp
+++ b/mozilla/vlcshell.cpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * vlcshell.cpp: a VLC plugin for Mozilla
  *****************************************************************************
- * Copyright (C) 2002 VideoLAN
+ * Copyright (C) 2002-2005 VideoLAN
  * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>