Merge commit '50c988aa6d6c6f0ceb8f922bcea34800b56b85d9'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Feb 2014 21:02:45 +0000 (22:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Feb 2014 21:05:12 +0000 (22:05 +0100)
* commit '50c988aa6d6c6f0ceb8f922bcea34800b56b85d9':
  hevc: Drop unnecessary shifts in deblocking_filter_CTB

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/hevc_filter.c

Simple merge