[FFmpeg-cvslog] Merge commit '94295106d20b32666a8c4e0d028ef79b9d3f3b7a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 21:43:03 2015 +0100| [e970b576d28dd515d4ccd665b53763e228816cac] | committer: Michael Niedermayer

Merge commit '94295106d20b32666a8c4e0d028ef79b9d3f3b7a'

* commit '94295106d20b32666a8c4e0d028ef79b9d3f3b7a':
  h264_mb: remove an unused function parameter

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

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