[FFmpeg-cvslog] Merge commit '09182b3224370e1d636631e77f201a8388766bd6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug 12 16:06:33 2014 +0200| [e6ffe7bcfc4a559624fdb543612d9ec839891793] | committer: Michael Niedermayer

Merge commit '09182b3224370e1d636631e77f201a8388766bd6'

* commit '09182b3224370e1d636631e77f201a8388766bd6':
  hevc: simplify rounding

Conflicts:
	libavcodec/hevc_mvs.c

See: 2e471e4703ed5aaab6d6b6bf5a3c6895b79f02b4
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e6ffe7bcfc4a559624fdb543612d9ec839891793
---