Merge commit '86f042dcabde2a5386dbd95ab0451b274987d253'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Jul 2013 07:19:58 +0000 (09:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Jul 2013 07:19:58 +0000 (09:19 +0200)
commit90279285227914dabf2cd011b186d2182291363a
treea60f50de1c7862beee6a9396fed6160000bcf375
parente64dc86a13c051934d9d0d1fd49f65100167427c
parent86f042dcabde2a5386dbd95ab0451b274987d253
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>
libavformat/wtv.h