Read extradata (justification, colors, fonts, etc) for mov/mp4 timed text

[ffmpeg] / libavutil / x86_cpu.h

diff --git a/libavutil/x86_cpu.h b/libavutil/x86_cpu.h
index a60b0b56a80af08a82d47aaefdd81597f0217f7a..4b5f10527e6a20ab25d2a8b61a3390e9d98416e4 100644 (file)
--- a/libavutil/x86_cpu.h
+++ b/libavutil/x86_cpu.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_X86CPU_H
-#define FFMPEG_X86CPU_H
+#ifndef AVUTIL_X86_CPU_H
+#define AVUTIL_X86_CPU_H
 
 #include <stdint.h>
 #include "config.h"
@@ -43,7 +43,7 @@ typedef int64_t x86_reg;
 #    define REGd    rdx
 #    define REGSP   rsp
 
-#else
+#elif ARCH_X86_32
 
 #    define REG_a "eax"
 #    define REG_b "ebx"
@@ -76,4 +76,4 @@ typedef int32_t x86_reg;
 #    define BROKEN_RELOCATIONS 1
 #endif
 
-#endif /* FFMPEG_X86CPU_H */
+#endif /* AVUTIL_X86_CPU_H */