/*****************************************************************************
* nsc.c: NSC file demux and encoding decoder
*****************************************************************************
- * Copyright (C) 2005 the VideoLAN team
+ * Copyright (C) 2005 VLC authors and VideoLAN
* $Id$
*
- * Authors: Jon Lech Johansen <jon@nanocrew.net>
- * Derk-Jan Hartman <hartman at videolan dot org>
+ * Authors: Derk-Jan Hartman <hartman at videolan dot org>
+ * based on work from Jon Lech Johansen <jon@nanocrew.net>
*
- * 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.
*****************************************************************************/
/*****************************************************************************
if( encoding_type == 1 )
{
- if( isxdigit( **input ) == 0 )
+ if( isxdigit( (unsigned char)**input ) == 0 )
return -1;
- if( isdigit( **input ) == 0 )
- *output = (toupper( **input ) - 7) * 16;
+ if( isdigit( (unsigned char)**input ) == 0 )
+ *output = (toupper( (unsigned char)**input ) - 7) * 16;
else
*output = **input * 16;
(*input)++;
- if( isxdigit( **input ) == 0 )
+ if( isxdigit( (unsigned char)**input ) == 0 )
return -1;
- if( isdigit( **input ) == 0 )
- *output |= toupper( **input ) - 0x37;
+ if( isdigit( (unsigned char)**input ) == 0 )
+ *output |= toupper( (unsigned char)**input ) - 0x37;
else
*output |= **input - 0x30;