Merge commit 'ae5a8dca675ee544178225256893e679b750cb63'
authorMichael Niedermayer <michael@niedermayer.cc>
Thu, 23 Jul 2015 10:35:10 +0000 (12:35 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 23 Jul 2015 10:35:10 +0000 (12:35 +0200)
commitb04b021005508e190ad02b66106c2c611b404a72
treea82dcb03f05755ff42f795f9def66587b24eed8c
parent157fa73992ab30b32160034e115aac21808084e2
parentae5a8dca675ee544178225256893e679b750cb63
Merge commit 'ae5a8dca675ee544178225256893e679b750cb63'

* commit 'ae5a8dca675ee544178225256893e679b750cb63':
  hap: Fix slice size computation

Conflicts:
libavcodec/hapdec.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/hap.h
libavcodec/hapdec.c