Skip to content

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

dshow: always override the demux when applicable

parent cb2fda7d
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 11 deletions
modules/access/dshow/dshow.cpp
View file @ 06360b94
...@@ -793,18 +793,15 @@ static int AccessOpen( vlc_object_t *p_this ) ...@@ -793,18 +793,15 @@ static int AccessOpen( vlc_object_t *p_this )
dshow_stream_t *p_stream = p_sys->pp_streams[0]; dshow_stream_t *p_stream = p_sys->pp_streams[0];
/* Check if we need to force demuxers */ /* Check if we need to force demuxers */
if( !p_access->psz_demux || !*p_access->psz_demux ) if( p_stream->i_fourcc == VLC_CODEC_DV )
{ {
if( p_stream->i_fourcc == VLC_CODEC_DV ) free( p_access->psz_demux );
{ p_access->psz_demux = strdup( "rawdv" );
free( p_access->psz_demux ); }
p_access->psz_demux = strdup( "rawdv" ); else if( p_stream->i_fourcc == VLC_CODEC_MPGV )
} {
else if( p_stream->i_fourcc == VLC_CODEC_MPGV ) free( p_access->psz_demux );
{ p_access->psz_demux = strdup( "mpgv" );
free( p_access->psz_demux );
p_access->psz_demux = strdup( "mpgv" );
}
} }
/* Setup Access */ /* Setup Access */
......
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