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>
This commit is contained in:
Michael Niedermayer 2013-07-27 09:19:58 +02:00
commit 9027928522

View File

@ -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)