Commit ba28c286 authored by Edward Wang's avatar Edward Wang Committed by Sébastien Escudier

live555: fix invalid conversion error

../../../modules/access/live555.cpp:2154:64: error: invalid conversion from 'char const*' to 'char*' [-fpermissive]
../../../contrib/arm-linux-androideabi/include/Base64.hh:28:16: error:   initializing argument 1 of 'unsigned char* base64Decode(char*, unsigned int&, Boolean)' [-fpermissive]

base64Decode appears to be defined as unsigned char* base64Decode(char* in, unsigned& resultSize, Boolean trimTrailingZeros);
Signed-off-by: default avatarSébastien Escudier <sebastien-devel@celeos.eu>
parent 953cedd2
...@@ -2151,7 +2151,13 @@ static uint8_t *parseVorbisConfigStr( char const* configStr, ...@@ -2151,7 +2151,13 @@ static uint8_t *parseVorbisConfigStr( char const* configStr,
configSize = 0; configSize = 0;
if( configStr == NULL || *configStr == '\0' ) if( configStr == NULL || *configStr == '\0' )
return NULL; return NULL;
#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1332115200 // 2012.03.20
unsigned char *p_cfg = base64Decode( configStr, configSize ); unsigned char *p_cfg = base64Decode( configStr, configSize );
#else
char* configStr_dup = strdup( configStr );
unsigned char *p_cfg = base64Decode( configStr_dup, configSize );
free( configStr_dup );
#endif
uint8_t *p_extra = NULL; uint8_t *p_extra = NULL;
/* skip header count, ident number and length (cf. RFC 5215) */ /* skip header count, ident number and length (cf. RFC 5215) */
const unsigned int headerSkip = 9; const unsigned int headerSkip = 9;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment