Merge commit '94295106d20b32666a8c4e0d028ef79b9d3f3b7a'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 20:43:03 +0000 (21:43 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 20:43:07 +0000 (21:43 +0100)
commite970b576d28dd515d4ccd665b53763e228816cac
tree7a79da8e4c6634777f7f24d0eaf1f41e66fee53d
parent8c6370afe3437e7f3e6398faa721f8f3e0a1e034
parent94295106d20b32666a8c4e0d028ef79b9d3f3b7a
Merge commit '94295106d20b32666a8c4e0d028ef79b9d3f3b7a'

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

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