Merge commit 'f349f4b5502c94943c30001b8a4d75daded3281c'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Nov 2014 20:24:15 +0000 (21:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Nov 2014 20:26:48 +0000 (21:26 +0100)
commitd3127691665ca071e6b090283b677efc9f2de8f1
tree0e212cce5208d225f9d1672eee0a81dd92ab6d36
parent9311026ec7a082c7ff9efff7a0d28e4d9832af6d
parentf349f4b5502c94943c30001b8a4d75daded3281c
Merge commit 'f349f4b5502c94943c30001b8a4d75daded3281c'

* commit 'f349f4b5502c94943c30001b8a4d75daded3281c':
  mpegvideo: fix size of array

See: 9f02d4ed0f72c017dba6fb71d5997c632aa52c08
Merged-by: Michael Niedermayer <michaelni@gmx.at>