Merge commit '12b54a1f39fee22fa0399825ae47a43e60bad4c5'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Feb 2013 13:28:26 +0000 (14:28 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Feb 2013 13:28:30 +0000 (14:28 +0100)
* commit '12b54a1f39fee22fa0399825ae47a43e60bad4c5':
  mpegvideo: remove an unused function parameter

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

Simple merge