Commit 1a90a3cd authored by gbazin's avatar gbazin

* ALL: a few fixes.

parent 9336401b
...@@ -734,6 +734,10 @@ static int Demux( demux_t *p_demux ) ...@@ -734,6 +734,10 @@ static int Demux( demux_t *p_demux )
case DVDNAV_STOP: /* EOF */ case DVDNAV_STOP: /* EOF */
msg_Dbg( p_demux, "DVDNAV_STOP" ); msg_Dbg( p_demux, "DVDNAV_STOP" );
#if DVD_READ_CACHE
dvdnav_free_cache_block( p_sys->dvdnav, packet );
#endif
return 0; return 0;
case DVDNAV_HIGHLIGHT: case DVDNAV_HIGHLIGHT:
......
...@@ -69,9 +69,10 @@ int screen_InitCapture( demux_t *p_demux ) ...@@ -69,9 +69,10 @@ int screen_InitCapture( demux_t *p_demux )
case 16: case 16:
i_chroma = VLC_FOURCC('R','V','1','6'); break; i_chroma = VLC_FOURCC('R','V','1','6'); break;
case 24: case 24:
i_chroma = VLC_FOURCC('R','V','2','4'); break;
case 32: case 32:
i_chroma = VLC_FOURCC('R','V','3','2'); break; i_chroma = VLC_FOURCC('R','V','3','2');
win_info.depth = 32;
break;
default: default:
msg_Err( p_demux, "unknown screen depth %i", win_info.depth ); msg_Err( p_demux, "unknown screen depth %i", win_info.depth );
XCloseDisplay( p_display ); XCloseDisplay( p_display );
......
...@@ -108,6 +108,10 @@ static int OpenDecoder( vlc_object_t *p_this ) ...@@ -108,6 +108,10 @@ static int OpenDecoder( vlc_object_t *p_this )
case VLC_FOURCC('R','V','1','5'): case VLC_FOURCC('R','V','1','5'):
break; break;
case VLC_FOURCC('y','v','1','2'):
p_dec->fmt_in.i_codec = VLC_FOURCC('Y','V','1','2');
break;
default: default:
return VLC_EGENERIC; return VLC_EGENERIC;
} }
......
...@@ -146,8 +146,7 @@ static int uri_test_param( char *psz_uri, const char *psz_name ); ...@@ -146,8 +146,7 @@ static int uri_test_param( char *psz_uri, const char *psz_name );
static void uri_decode_url_encoded( char *psz ); static void uri_decode_url_encoded( char *psz );
static char *Find_end_MRL( char *psz ); static char *Find_end_MRL( char *psz );
static playlist_item_t *parse_MRL( intf_thread_t * , char *psz );
static playlist_item_t * parse_MRL( intf_thread_t * , char *psz );
/***************************************************************************** /*****************************************************************************
* *
...@@ -3291,7 +3290,7 @@ static char *Find_end_MRL( char *psz ) ...@@ -3291,7 +3290,7 @@ static char *Find_end_MRL( char *psz )
* create an item with all information in it, and return the item. * create an item with all information in it, and return the item.
* return NULL if there is an error. * return NULL if there is an error.
**********************************************************************/ **********************************************************************/
playlist_item_t * parse_MRL( intf_thread_t *p_intf, char *psz ) static playlist_item_t *parse_MRL( intf_thread_t *p_intf, char *psz )
{ {
char **ppsz_options = NULL; char **ppsz_options = NULL;
char *mrl; char *mrl;
...@@ -3395,11 +3394,8 @@ playlist_item_t * parse_MRL( intf_thread_t *p_intf, char *psz ) ...@@ -3395,11 +3394,8 @@ playlist_item_t * parse_MRL( intf_thread_t *p_intf, char *psz )
} }
} }
for( i = 0 ; i < i_options ; i++ ) for( i = 0; i < i_options; i++ ) free( ppsz_options[i] );
{ if( i_options ) free( ppsz_options );
free( ppsz_options[i] );
}
free( ppsz_options );
return p_item; return p_item;
} }
...@@ -620,7 +620,7 @@ static int Init( input_thread_t * p_input, vlc_bool_t b_quick ) ...@@ -620,7 +620,7 @@ static int Init( input_thread_t * p_input, vlc_bool_t b_quick )
p_input->p_sout = sout_NewInstance( p_input, psz ); p_input->p_sout = sout_NewInstance( p_input, psz );
if( p_input->p_sout == NULL ) if( p_input->p_sout == NULL )
{ {
msg_Err( p_input, "cannot start stream output instance," \ msg_Err( p_input, "cannot start stream output instance, " \
"aborting" ); "aborting" );
free( psz ); free( psz );
return VLC_EGENERIC; return VLC_EGENERIC;
......
...@@ -163,8 +163,9 @@ int intf_RunThread( intf_thread_t *p_intf ) ...@@ -163,8 +163,9 @@ int intf_RunThread( intf_thread_t *p_intf )
[VLCApplication sharedApplication]; [VLCApplication sharedApplication];
} }
if( p_intf->b_block && ( !strncmp( p_intf->p_module->psz_object_name, "macosx" , 6 ) || if( p_intf->b_block &&
!strncmp( p_intf->p_vlc->psz_object_name, "clivlc", 6 ) ) ) ( !strncmp( p_intf->p_module->psz_object_name, "macosx" , 6 ) ||
!strncmp( p_intf->p_vlc->psz_object_name, "clivlc", 6 ) ) )
{ {
/* VLC in normal primary interface mode */ /* VLC in normal primary interface mode */
RunInterface( p_intf ); RunInterface( p_intf );
......
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