[FFmpeg-cvslog] Merge commit '12b54a1f39fee22fa0399825ae47a43e60bad4c5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Feb  7 14:28:26 2013 +0100| [c7002e3d3dad3e026ec304066de65b5a21910067] | committer: Michael Niedermayer

Merge commit '12b54a1f39fee22fa0399825ae47a43e60bad4c5'

* commit '12b54a1f39fee22fa0399825ae47a43e60bad4c5':
  mpegvideo: remove an unused function parameter

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

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