Fix Authorship

modules/access/rdp.c

 /*****************************************************************************
  * rdp.c: libfreeRDP based Remote Desktop access
  *****************************************************************************
- * Copyright (C) 2013 VideoLAN Authors
+ * Copyright (C) 2013 VideoLAN and VLC Authors
  *****************************************************************************
  *
  * This program is free software; you can redistribute it and/or modify it

modules/access/vnc.c

 /*****************************************************************************
  * vnc.c: libVNC access
  *****************************************************************************
- * Copyright (C) 2013 VideoLAN Authors
+ * Copyright (C) 2013 VideoLAN and VLC Authors
  *****************************************************************************
  *
  * This program is free software; you can redistribute it and/or modify it

modules/demux/adaptative/PlaylistManager.cpp

@@ -2,7 +2,7 @@
  * PlaylistManager.cpp
  *****************************************************************************
  * Copyright © 2010 - 2011 Klagenfurt University
- *             2015 VideoLAN Authors
+ *             2015 VideoLAN and VLC Authors
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published

modules/demux/adaptative/PlaylistManager.h

@@ -2,7 +2,7 @@
  * PlaylistManager.h
  *****************************************************************************
  * Copyright © 2010 - 2011 Klagenfurt University
- *             2015 VideoLAN Authors
+ *             2015 VideoLAN and VLC Authors
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published

modules/demux/adaptative/http/HTTPConnection.cpp

 /*
  * HTTPConnection.cpp
  *****************************************************************************
- * Copyright (C) 2014-2015 - VideoLAN Authors
+ * Copyright (C) 2014-2015 - VideoLAN and VLC Authors
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published

modules/demux/adaptative/http/HTTPConnection.hpp

@@ -2,7 +2,7 @@
  * HTTPConnection.hpp
  *****************************************************************************
  * Copyright (C) 2010 - 2011 Klagenfurt University
- *               2014 - 2015 VideoLAN Authors
+ *               2014 - 2015 VideoLAN and VLC Authors
  *
  * Created on: Aug 10, 2010
  * Authors: Christopher Mueller <christopher.mueller@itec.uni-klu.ac.at>

modules/demux/adaptative/playlist/ICanonicalUrl.hpp

 /*
  * ICanonicalUrl.hpp
  *****************************************************************************
- * Copyright (C) 2014 - VideoLAN Authors
+ * Copyright (C) 2014 - VideoLAN and VLC Authors
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published

modules/demux/adaptative/playlist/SegmentInformation.cpp

 /*
  * SegmentInformation.cpp
  *****************************************************************************
- * Copyright (C) 2014 - VideoLAN Authors
+ * Copyright (C) 2014 - VideoLAN and VLC Authors
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published

modules/demux/adaptative/playlist/SegmentInformation.hpp

 /*
  * SegmentInformation.hpp
  *****************************************************************************
- * Copyright (C) 2014 - VideoLAN Authors
+ * Copyright (C) 2014 - VideoLAN and VLC Authors
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published

modules/demux/adaptative/playlist/Url.cpp

 /*
  * Url.cpp
  *****************************************************************************
- * Copyright (C) 2014 - VideoLAN Authors
+ * Copyright (C) 2014 - VideoLAN and VLC Authors
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published

modules/demux/adaptative/playlist/Url.hpp

 /*
  * Url.hpp
  *****************************************************************************
- * Copyright (C) 2014 - VideoLAN Authors
+ * Copyright (C) 2014 - VideoLAN and VLC Authors
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published

modules/demux/adaptative/tools/Properties.hpp

 /*
  * Inheritables.hpp
  *****************************************************************************
- * Copyright (C) 2014 - VideoLAN Authors
+ * Copyright (C) 2014 - VideoLAN and VLC Authors
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published

modules/demux/adaptative/tools/Retrieve.cpp

 /*
  * Parser.cpp
  *****************************************************************************
- * Copyright © 2015 - VideoLAN Authors
+ * Copyright © 2015 - VideoLAN and VLC Authors
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published

modules/demux/adaptative/tools/Retrieve.hpp

 /*
  * Retrieve.hpp
  *****************************************************************************
- * Copyright © 2015 - VideoLAN Authors
+ * Copyright © 2015 - VideoLAN and VLC Authors
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published

modules/demux/dash/dash.hpp

 /*****************************************************************************
  * dash.hpp: DASH module
  *****************************************************************************
- * Copyright © 2014 - VideoLAN Authors
+ * Copyright © 2014 - VideoLAN and VLC Authors
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published

modules/demux/dash/mpd/Profile.cpp

 /*
  * Profile.cpp
  *****************************************************************************
- * Copyright (C) 2010 - 2014 VideoLAN Authors
+ * Copyright (C) 2010 - 2014 VideoLAN and VLC Authors
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published

modules/demux/dash/mpd/Profile.hpp

 /*
  * Profile.hpp
  *****************************************************************************
- * Copyright (C) 2010 - 2014 VideoLAN Authors
+ * Copyright (C) 2010 - 2014 VideoLAN and VLC Authors
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published

modules/demux/hls/hls.cpp

 /*****************************************************************************
  * hls.cpp: HTTP Live Streaming module
  *****************************************************************************
- * Copyright © 2015 - VideoLAN Authors
+ * Copyright © 2015 - VideoLAN and VLC Authors
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published

modules/demux/hls/hls.hpp

 /*****************************************************************************
  * hls.hpp: HTTP Live Streaming module
  *****************************************************************************
- * Copyright © 2015 - VideoLAN Authors
+ * Copyright © 2015 - VideoLAN and VLC Authors
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published

modules/demux/hls/playlist/M3U8.cpp

 /*
  * M3U8.cpp
  *****************************************************************************
- * Copyright © 2015 - VideoLAN Authors
+ * Copyright © 2015 - VideoLAN and VLC Authors
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published