vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sat Apr 12 21:59:43 2014 +0300| [06360b941df9727aa3437de2d97947fdf3fcef38] | committer: Rémi Denis-Courmont
dshow: always override the demux when applicable > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=06360b941df9727aa3437de2d97947fdf3fcef38 --- modules/access/dshow/dshow.cpp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp index 82b0917..389371a 100644 --- a/modules/access/dshow/dshow.cpp +++ b/modules/access/dshow/dshow.cpp @@ -793,18 +793,15 @@ static int AccessOpen( vlc_object_t *p_this ) dshow_stream_t *p_stream = p_sys->pp_streams[0]; /* 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" ); - } - 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( "rawdv" ); + } + else if( p_stream->i_fourcc == VLC_CODEC_MPGV ) + { + free( p_access->psz_demux ); + p_access->psz_demux = strdup( "mpgv" ); } /* Setup Access */ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
