demux: ogg: fix headers validation

[vlc] / modules / demux / sid.cpp

diff --git a/modules/demux/sid.cpp b/modules/demux/sid.cpp
index 29a9ad6503afa324e9c9151d78ffb39c44db409f..c31a65910acbca290f8df9a99df9e94f7840bfc9 100644 (file)
--- a/modules/demux/sid.cpp
+++ b/modules/demux/sid.cpp
@@ -13,7 +13,7 @@
  *
  * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
@@ -21,6 +21,14 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+/*****************************************************************************
+ * NOTA BENE: this module requires the linking against a library which is
+ * known to require licensing under the GNU General Public License version 2
+ * (or later). Therefore, the result of compiling this module will normally
+ * be subject to the terms of that later license.
+ *****************************************************************************/
+
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
@@ -174,7 +182,7 @@ static int Open (vlc_object_t *obj)
     return VLC_SUCCESS;
 
 error:
-    msg_Err (demux, "An error occured during sid demuxing" );
+    msg_Err (demux, "An error occurred during sid demuxing" );
     delete player;
     delete builder;
     delete tune;
@@ -198,7 +206,7 @@ static int Demux (demux_t *demux)
 {
     demux_sys_t *sys = demux->p_sys;
 
-    block_t *block = block_New( p_demux, sys->block_size);
+    block_t *block = block_Alloc( sys->block_size);
     if (unlikely(block==NULL))
         return 0;
 
@@ -254,7 +262,7 @@ static int Control (demux_t *demux, int query, va_list args)
                 int *pi_int    = (int*)va_arg( args, int* );
 
                 *pi_int = sys->tuneInfo.songs;
-                *ppp_title = (input_title_t**) malloc( sizeof (input_title_t**) * sys->tuneInfo.songs);
+                *ppp_title = (input_title_t**) malloc( sizeof (input_title_t*) * sys->tuneInfo.songs);
 
                 for( int i = 0; i < sys->tuneInfo.songs; i++ ) {
                     (*ppp_title)[i] = vlc_input_title_New();