Commit 7eadbd99 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

access_demux: Remove unneeded checks for psz_access nullity

It will never be NULL for access & access_demux, but can be
for demux_filter. However, these modules aren't demux_filter
parent 1248a185
......@@ -629,7 +629,7 @@ static int blurayOpen(vlc_object_t *object)
forced = !strcasecmp(p_demux->psz_access, "bluray");
if (p_demux->s) {
if (p_demux->psz_access == NULL || !strcasecmp(p_demux->psz_access, "file")) {
if (!strcasecmp(p_demux->psz_access, "file")) {
/* use access_demux for local files */
return VLC_EGENERIC;
}
......
......@@ -344,8 +344,7 @@ static int AccessDemuxOpen ( vlc_object_t *p_this )
int i_ret = VLC_EGENERIC;
bool forced = false;
if( p_demux->psz_access != NULL
&& !strncmp(p_demux->psz_access, "dvd", 3) )
if( !strncmp(p_demux->psz_access, "dvd", 3) )
forced = true;
if( !p_demux->psz_file || !*p_demux->psz_file )
......
......@@ -169,7 +169,7 @@ static int Open( vlc_object_t *p_this )
if( !p_demux->psz_file || !*p_demux->psz_file )
{
/* Only when selected */
if( !p_demux->psz_access || !*p_demux->psz_access )
if( !*p_demux->psz_access )
return VLC_EGENERIC;
psz_file = var_InheritString( p_this, "dvd" );
......
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