Merge commit 'b37e796082b2d787aff3cd5631bb89c4fd374708'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 14:18:55 +0000 (15:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 14:19:39 +0000 (15:19 +0100)
commit29ba1cff2b79dbac989a966aaa0cdca9d01db7cb
tree1c8d93ad4853c8770e41d14575ddb97ddb810bc9
parent7c4b96f55eb60789031bbade74dc2a0f65f616f4
parentb37e796082b2d787aff3cd5631bb89c4fd374708
Merge commit 'b37e796082b2d787aff3cd5631bb89c4fd374708'

* commit 'b37e796082b2d787aff3cd5631bb89c4fd374708':
  hevc: Use uint64 to check for tile dimensions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/hevc.h
libavcodec/hevc_ps.c