[FFmpeg-cvslog] Merge commit 'e6c90ce94f1b07f50cea2babf7471af455cca0ff'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 15:59:16 2015 +0100| [7d23931632ea3af55ec4ddb1e572ff31aa2c1e9a] | committer: Michael Niedermayer

Merge commit 'e6c90ce94f1b07f50cea2babf7471af455cca0ff'

* commit 'e6c90ce94f1b07f50cea2babf7471af455cca0ff':
  h264: move loopfilter parameters into the per-slice context

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

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