dash: fix invalid C++11 suffix literals

[vlc] / modules / demux / nuv.c

diff --git a/modules/demux/nuv.c b/modules/demux/nuv.c
index 6a852b340184c934091cdf1bf6a7c35183d3748c..be4008dc1e89fc55b7a87c0dfa4c56253ea06858 100644 (file)
--- a/modules/demux/nuv.c
+++ b/modules/demux/nuv.c
@@ -1,25 +1,25 @@
 /*****************************************************************************
  * nuv.c:
  *****************************************************************************
- * Copyright (C) 2005 the VideoLAN team
+ * Copyright (C) 2005 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *          Gertjan Van Droogenbroeck <gertjanvd _PLUS_ vlc _AT_ gmail _DOT_ com>
  *
- * 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 of the License, or
+ * 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 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 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.
+ * 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.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -249,7 +249,7 @@ static int Open( vlc_object_t * p_this )
     {
         if( fh.i_compression == 'F' || fh.i_compression == 'R' )
         {
-            /* ffmpeg extra data */
+            /* libavcodec extra data */
             p_sys->i_extra_f = fh.i_length;
             p_sys->p_extra_f = malloc( fh.i_length );
             if( p_sys->p_extra_f == NULL || stream_Read( p_demux->s,
@@ -364,9 +364,6 @@ static int Demux( demux_t *p_demux )
 
     for( ;; )
     {
-        if( !vlc_object_alive (p_demux) )
-            return -1;
-
         if( FrameHeaderLoad( p_demux, &fh ) )
             return 0;
 
@@ -573,7 +570,7 @@ static int ControlSetPosition( demux_t *p_demux, int64_t i_pos, bool b_guess )
         }
     }
 
-    while( vlc_object_alive (p_demux) )
+    for( ;; )
     {
         frame_header_t fh;
         int64_t i_tell;