Commits

Steve Borho committed 8a84c10 Merge

Merge with stable

Comments (0)

Files changed (3)

source/CMakeLists.txt

         set_target_properties(x265-shared PROPERTIES OUTPUT_NAME x265)
     endif()
     if(UNIX AND NOT APPLE)
-        set_target_properties(x265-shared PROPERTIES LINK_FLAGS "-Wl,-Bsymbolic")
+        set_target_properties(x265-shared PROPERTIES LINK_FLAGS "-Wl,-Bsymbolic,-znoexecstack")
     endif()
     if(X265_LATEST_TAG)
         # shared library is not installed if a tag is not found

source/common/threading.h

 
 #ifdef __GNUC__                         /* GCCs builtin atomics */
 
+#include <sys/time.h>
 #include <unistd.h>
 #include <limits.h>
 
     void trigger()
     {
         pthread_mutex_lock(&m_mutex);
-        if (m_counter < UINT32_MAX)
+        if (m_counter < UINT_MAX)
             m_counter++;
         /* Signal a single blocking thread */
         pthread_cond_signal(&m_cond);

source/common/x86/ipfilter16.asm

     lea         r%6,      [tab_ChromaCoeff]
     movh        m0,       [r%6 + r4 * 4]
 %else
-    movh        m0,       [tab_ChromaCoeff1 + r4 * 4]
+    movh        m0,       [tab_ChromaCoeff + r4 * 4]
 %endif
 
     punpcklqdq  m0,       m0