Merge commit 'ff300e435e5337b03dc7a8f1c0be6c9937059c1e'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 00:21:28 +0000 (01:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 00:21:39 +0000 (01:21 +0100)
commit85d3bc33b1c19726a481143b2515fa86383e0a72
treef38c7d8a6df628f413f35d4223957b389b0de054
parent92e10e34b1422423715bbfadfcd19b045f63dbcc
parentff300e435e5337b03dc7a8f1c0be6c9937059c1e
Merge commit 'ff300e435e5337b03dc7a8f1c0be6c9937059c1e'

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

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