Skip to content

V
vlc-2-2
Commit 8cb6c0e6 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Spare relocations

parent 4fac9bb2
Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 20 deletions
modules/codec/realvideo.c
View file @ 8cb6c0e6
...@@ -254,29 +254,29 @@ static int InitVideo(decoder_t *p_dec) ...@@ -254,29 +254,29 @@ static int InitVideo(decoder_t *p_dec)
if( (p_sys->rv_handle = load_syms(p_dec, g_decode_path)) ) if( (p_sys->rv_handle = load_syms(p_dec, g_decode_path)) )
b_so_opened = true; b_so_opened = true;
#else #else
const char *ppsz_path[] = static const char psz_paths[] =
{ {
"/usr/lib/win32", "/usr/lib/win32\0"
"/usr/lib/codecs", "/usr/lib/codecs\0"
"/usr/local/RealPlayer8/Codecs", "/usr/local/RealPlayer8/Codecs\0"
"/usr/RealPlayer8/Codecs", "/usr/RealPlayer8/Codecs\0"
"/usr/lib/RealPlayer8/Codecs", "/usr/lib/RealPlayer8/Codecs\0"
"/opt/RealPlayer8/Codecs", "/opt/RealPlayer8/Codecs\0"
"/usr/lib/RealPlayer9/users/Real/Codecs", "/usr/lib/RealPlayer9/users/Real/Codecs\0"
"/usr/lib/RealPlayer10/codecs", "/usr/lib/RealPlayer10/codecs\0"
"/usr/lib/RealPlayer10GOLD/codecs", "/usr/lib/RealPlayer10GOLD/codecs\0"
"/usr/lib/helix/player/codecs", "/usr/lib/helix/player/codecs\0"
"/usr/lib64/RealPlayer8/Codecs", "/usr/lib64/RealPlayer8/Codecs\0"
"/usr/lib64/RealPlayer9/users/Real/Codecs", "/usr/lib64/RealPlayer9/users/Real/Codecs\0"
"/usr/lib64/RealPlayer10/codecs", "/usr/lib64/RealPlayer10/codecs\0"
"/usr/lib64/RealPlayer10GOLD/codecs", "/usr/lib64/RealPlayer10GOLD/codecs\0"
"/usr/local/lib/codecs", "/usr/local/lib/codecs\0"
NULL "\0"
}; };
for( int i = 0; ppsz_path[i]; i++ ) for( size_t i = 0; psz_paths[i]; i += strlen( psz_paths[i] ) + 1 )
{ {
asprintf( &g_decode_path, "%s/drv4.so.6.0", ppsz_path[i] ); asprintf( &g_decode_path, "%s/drv4.so.6.0", psz_paths + i );
if( (p_sys->rv_handle = load_syms_linux(p_dec, g_decode_path)) ) if( (p_sys->rv_handle = load_syms_linux(p_dec, g_decode_path)) )
{ {
b_so_opened = true; b_so_opened = true;
...@@ -284,7 +284,7 @@ static int InitVideo(decoder_t *p_dec) ...@@ -284,7 +284,7 @@ static int InitVideo(decoder_t *p_dec)
break; break;
} }
asprintf( &g_decode_path, "%s/drv3.so.6.0", ppsz_path[i] ); asprintf( &g_decode_path, "%s/drv3.so.6.0", psz_paths + i );
if( (p_sys->rv_handle = load_syms_linux(p_dec, g_decode_path)) ) if( (p_sys->rv_handle = load_syms_linux(p_dec, g_decode_path)) )
{ {
b_so_opened = true; b_so_opened = true;
......
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