Merge commit 'e5b019725f53b79159931d3a7317107cbbfd0860'
authorJames Almer <jamrial@gmail.com>
Thu, 16 Mar 2017 00:40:35 +0000 (21:40 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 16 Mar 2017 00:40:35 +0000 (21:40 -0300)
* commit 'e5b019725f53b79159931d3a7317107cbbfd0860':
  m4vdec: Check for non-startcode 00 00 00 sequences in probe

This commit is a noop, see 7c1835c52a4be2e4e996f83c91a8d5a147b01100

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

Trivial merge