Loading lib_basop/move.h +0 −2 Original line number Diff line number Diff line Loading @@ -37,8 +37,6 @@ #ifndef _MOVE_H #define _MOVE_H #include "wmc_auto.h" static __inline void move16( void ) { #ifdef WMOPS Loading lib_dec/ivas_ism_metadata_dec_fx.c +5 −0 Original line number Diff line number Diff line Loading @@ -31,12 +31,17 @@ *******************************************************************************************************/ #include <stdint.h> #include <math.h> #include "options.h" #include "stl.h" #include "ivas_cnst.h" #include "ivas_prot_fx.h" #include "ivas_rom_com.h" #include "prot_fx.h" <<<<<<< HEAD ======= #include "ivas_stat_enc.h" >>>>>>> 61c31ac7a (add missing include, use stl.h instead of move.h) #include "wmc_auto.h" Loading Loading
lib_basop/move.h +0 −2 Original line number Diff line number Diff line Loading @@ -37,8 +37,6 @@ #ifndef _MOVE_H #define _MOVE_H #include "wmc_auto.h" static __inline void move16( void ) { #ifdef WMOPS Loading
lib_dec/ivas_ism_metadata_dec_fx.c +5 −0 Original line number Diff line number Diff line Loading @@ -31,12 +31,17 @@ *******************************************************************************************************/ #include <stdint.h> #include <math.h> #include "options.h" #include "stl.h" #include "ivas_cnst.h" #include "ivas_prot_fx.h" #include "ivas_rom_com.h" #include "prot_fx.h" <<<<<<< HEAD ======= #include "ivas_stat_enc.h" >>>>>>> 61c31ac7a (add missing include, use stl.h instead of move.h) #include "wmc_auto.h" Loading