[FFmpeg-cvslog] Merge commit 'fe27aeaeab07142b1acd2690c64ee6973bdd7eba'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 11 21:04:45 2014 +0100| [aeb1621d1f173fc59eb52781caa6c7437e657b1b] | committer: Michael Niedermayer

Merge commit 'fe27aeaeab07142b1acd2690c64ee6973bdd7eba'

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

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

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