lua: remove recursion

[vlc] / modules / demux / sid.cpp

diff --git a/modules/demux/sid.cpp b/modules/demux/sid.cpp
index d546e395997d7e79b217f1844ae33edd68b82ea6..b901b98ba7c0097d61f238fbd2f36218b6b63195 100644 (file)
--- a/modules/demux/sid.cpp
+++ b/modules/demux/sid.cpp
@@ -6,20 +6,28 @@
  * Copyright © 2010 Rémi Denis-Courmont
  * Copyright © 2010 Alan Fischer <alan@lightningtoads.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1
- * 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 Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * 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.
+ * 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 along with this library; 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 Lesser 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.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * 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>
@@ -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;