[FFmpeg-cvslog] Merge commit '3297577f3eac1c87d48dedd527942de2bd28e7a5'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Fri Mar 31 17:08:50 2017 -0300| [b00f44e513e9e927ad94a7385afe8cf67691c513] | committer: James Almer

Merge commit '3297577f3eac1c87d48dedd527942de2bd28e7a5'

* commit '3297577f3eac1c87d48dedd527942de2bd28e7a5':
  mpegvideo: Return correct coded frame sizes from parser

This commit is a noop, see 309fe16a126c6c00cc60070de3190cf23f5570fb

Merged-by: James Almer <jamrial at gmail.com>

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