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)
* commit 'ff300e435e5337b03dc7a8f1c0be6c9937059c1e':
  mpegvideo: remove an unused variable

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

Simple merge