[FFmpeg-cvslog] Merge commit '99a35d1ccbb6b6cd260ce5c8369a897a79fe6a3a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 14:14:01 2015 +0100| [892a6d00280215ab4c1485c0931912f82318dc63] | committer: Michael Niedermayer

Merge commit '99a35d1ccbb6b6cd260ce5c8369a897a79fe6a3a'

* commit '99a35d1ccbb6b6cd260ce5c8369a897a79fe6a3a':
  h264: move neighbor_transform_size into the per-slice context

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

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