[FFmpeg-cvslog] Merge commit 'ff300e435e5337b03dc7a8f1c0be6c9937059c1e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec  6 01:21:28 2013 +0100| [85d3bc33b1c19726a481143b2515fa86383e0a72] | committer: Michael Niedermayer

Merge commit 'ff300e435e5337b03dc7a8f1c0be6c9937059c1e'

* commit 'ff300e435e5337b03dc7a8f1c0be6c9937059c1e':
  mpegvideo: remove an unused variable

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

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