Merge commit 'd5c15ebeaf1914ea5e3e0599d4316d7c4cf74434'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 14:12:53 +0000 (15:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 14:12:53 +0000 (15:12 +0100)
commit7c4b96f55eb60789031bbade74dc2a0f65f616f4
tree2b8405f448bc5330ec844f4c840bcce4c44ad6fc
parent42a29015e1bd5ae6d8c5d379ce4294193288220f
parentd5c15ebeaf1914ea5e3e0599d4316d7c4cf74434
Merge commit 'd5c15ebeaf1914ea5e3e0599d4316d7c4cf74434'

* commit 'd5c15ebeaf1914ea5e3e0599d4316d7c4cf74434':
  hevc: Fix modulo operations

Conflicts:
libavcodec/hevc.c
libavcodec/hevc_filter.c

See: 4ced5d7780fea2ea49444d6686d26f26b3a2160f
Merged-by: Michael Niedermayer <michaelni@gmx.at>