]> git.sesse.net Git - ffmpeg/commit
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)
commit67817468d3fdabce64239c75c216337f66136682
treefeec7af17e1a861b058d339bbf2713d57fbe311e
parente298497f0c6ed7c87371ca78a3788d2d0026cd0c
parente5b019725f53b79159931d3a7317107cbbfd0860
Merge commit 'e5b019725f53b79159931d3a7317107cbbfd0860'

* 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>