diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-27 09:19:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-27 09:19:58 +0200 |
| commit | 90279285227914dabf2cd011b186d2182291363a (patch) | |
| tree | a60f50de1c7862beee6a9396fed6160000bcf375 /libavformat/wtv.h | |
| parent | e64dc86a13c051934d9d0d1fd49f65100167427c (diff) | |
| parent | 86f042dcabde2a5386dbd95ab0451b274987d253 (diff) | |
Merge commit '86f042dcabde2a5386dbd95ab0451b274987d253'
* commit '86f042dcabde2a5386dbd95ab0451b274987d253':
wtv: Make WTV_SECTOR_BITS a 64 bit constant
Conflicts:
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/wtv.h')
| -rw-r--r-- | libavformat/wtv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/wtv.h b/libavformat/wtv.h index efe90d6846..51ac626115 100644 --- a/libavformat/wtv.h +++ b/libavformat/wtv.h @@ -25,7 +25,7 @@ #include "riff.h" #include "asf.h" -#define WTV_SECTOR_BITS 12 +#define WTV_SECTOR_BITS INT64_C(12) #define WTV_SECTOR_SIZE (1 << WTV_SECTOR_BITS) #define WTV_BIGSECTOR_BITS 18 #define WTV_PAD8(x) (((x) + 7) & ~7) |