[FFmpeg-cvslog] Merge commit 'e5b019725f53b79159931d3a7317107cbbfd0860'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Mar 15 21:40:35 2017 -0300| [67817468d3fdabce64239c75c216337f66136682] | committer: James Almer

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 at gmail.com>

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