Commit 1abd1b07 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch '1415-bitwise-comparison-instead-of-logical-comparison-in-ivas_init_dec-c' into 'main' 

Resolve "Bitwise comparison instead of logical comparison in ivas_init_dec.c"

See merge request !2300
parents 9ddacaa8 ba0ddac4

lib_dec/ivas_init_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -3198,7 +3198,7 @@ static ivas_error doSanityChecks_IVAS( 
        }

    }



    if ( st_ivas->hDecoderConfig->Opt_ObjEdit_on & st_ivas->hDecoderConfig->Opt_non_diegetic_pan )

    if ( st_ivas->hDecoderConfig->Opt_ObjEdit_on && st_ivas->hDecoderConfig->Opt_non_diegetic_pan )

    {

        return IVAS_ERROR( IVAS_ERR_OBJECTS_EDITING_AND_PANNING_NOT_SUPPORTED, "Wrong set-up: Only object editing or Non-diegetic panning can be used." );

    }