[FFmpeg-cvslog] Merge commit 'ee0d774dfa94655e44707ff3e02f4a4d282c1963'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 14:39:45 2015 +0100| [bd76a4822f989f30c6dc109a5157d6239a6b1112] | committer: Michael Niedermayer

Merge commit 'ee0d774dfa94655e44707ff3e02f4a4d282c1963'

* commit 'ee0d774dfa94655e44707ff3e02f4a4d282c1963':
  h264: move dist_scale_factor[_field] into the per-slice context

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

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