Merge commit 'fe27aeaeab07142b1acd2690c64ee6973bdd7eba'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Nov 2014 20:04:45 +0000 (21:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Nov 2014 20:16:00 +0000 (21:16 +0100)
commitaeb1621d1f173fc59eb52781caa6c7437e657b1b
treeab83b07e58fef3b7e41f58c73a8d181530ab44ca
parent81e3f819bd1b1bf6aff7a8adf3f50262f383b9f9
parentfe27aeaeab07142b1acd2690c64ee6973bdd7eba
Merge commit 'fe27aeaeab07142b1acd2690c64ee6973bdd7eba'

* commit 'fe27aeaeab07142b1acd2690c64ee6973bdd7eba':
  mpeg12enc: increase declared size of block function argument

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