Merge commit '3297577f3eac1c87d48dedd527942de2bd28e7a5'
authorJames Almer <jamrial@gmail.com>
Fri, 31 Mar 2017 20:08:50 +0000 (17:08 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 31 Mar 2017 20:08:50 +0000 (17:08 -0300)
commitb00f44e513e9e927ad94a7385afe8cf67691c513
treec4e5482362cb93e673321e78fc3f415e791aa690
parentc6f06876e1082f6dbb15abfe5f940ed8372e77dc
parent3297577f3eac1c87d48dedd527942de2bd28e7a5
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@gmail.com>