diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-19 00:04:43 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-19 00:04:43 +0200 |
commit | 79e1aa7cc7a9ac695c3af361bca72013ef272885 (patch) | |
tree | cc52764dfa4fab2cfc74c6aee5d71b27edbf014b /libmpdemux/asfguid.h | |
parent | 3ba97da297e1e1a5ca9dabdda60cc6a62f77affc (diff) | |
parent | 39cb032fd184a62416f1e62d26e05576cfd8dbe4 (diff) | |
download | mpv-79e1aa7cc7a9ac695c3af361bca72013ef272885.tar.bz2 mpv-79e1aa7cc7a9ac695c3af361bca72013ef272885.tar.xz |
Merge svn changes up to r28341
Conflicts:
configure
libmpcodecs/native/rtjpegn.c
Diffstat (limited to 'libmpdemux/asfguid.h')
-rw-r--r-- | libmpdemux/asfguid.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/asfguid.h b/libmpdemux/asfguid.h index e9b8b08567..f5a9989e9f 100644 --- a/libmpdemux/asfguid.h +++ b/libmpdemux/asfguid.h @@ -26,7 +26,7 @@ #include "mpbswap.h" -#ifdef ARCH_X86 +#if ARCH_X86 #define ASF_LOAD_GUID_PREFIX(guid) (*(uint32_t *)(guid)) #else #define ASF_LOAD_GUID_PREFIX(guid) AV_RL32(guid) |