Merge commit '09182b3224370e1d636631e77f201a8388766bd6'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Aug 2014 14:06:33 +0000 (16:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Aug 2014 14:07:07 +0000 (16:07 +0200)
commite6ffe7bcfc4a559624fdb543612d9ec839891793
treeaaae22c7f9a6167872c54463b2add23b928d2faa
parent2278146a0ca06ab88cc4885f9f7b1d56eff9873f
parent09182b3224370e1d636631e77f201a8388766bd6
Merge commit '09182b3224370e1d636631e77f201a8388766bd6'

* commit '09182b3224370e1d636631e77f201a8388766bd6':
  hevc: simplify rounding

Conflicts:
libavcodec/hevc_mvs.c

See: 2e471e4703ed5aaab6d6b6bf5a3c6895b79f02b4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/hevc_mvs.c