Commit 53056dd8 authored by vaclav's avatar vaclav
Browse files

fix merging

parent 5c85bae6

lib_dec/lib_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -2470,11 +2470,7 @@ ivas_error IVAS_DEC_GetNumObjects( 
        }

    }



#ifndef LIB_DEC_REVISION

    if ( hIvasDec->st_ivas->ivas_format == ISM_FORMAT || hIvasDec->st_ivas->ivas_format == SBA_ISM_FORMAT || hIvasDec->st_ivas->ivas_format == MASA_ISM_FORMAT || is_masa_ism )

#else

    if ( hIvasDec->st_ivas->ivas_format == ISM_FORMAT || hIvasDec->st_ivas->ivas_format == SBA_ISM_FORMAT || hIvasDec->st_ivas->ivas_format == MASA_ISM_FORMAT )

#endif

    {

        *numObjects = hIvasDec->st_ivas->nchan_ism;

    }