[FFmpeg-cvslog] Merge commit '50c988aa6d6c6f0ceb8f922bcea34800b56b85d9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 23 22:02:45 2014 +0100| [c2b5981afa4e27bbc374354e1054df4cb437b909] | committer: Michael Niedermayer

Merge commit '50c988aa6d6c6f0ceb8f922bcea34800b56b85d9'

* commit '50c988aa6d6c6f0ceb8f922bcea34800b56b85d9':
  hevc: Drop unnecessary shifts in deblocking_filter_CTB

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

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