[FFmpeg-cvslog] Merge commit 'e4b38878da6b38ef5ca54ce14be985d6ae088834'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Wed Jun 22 19:57:11 2016 +0200| [575be7311cff2c958ca289df408d3e9ce2e2b1c0] | committer: Clément Bœsch

Merge commit 'e4b38878da6b38ef5ca54ce14be985d6ae088834'

* commit 'e4b38878da6b38ef5ca54ce14be985d6ae088834':
  Move check_marker() from get_bits to mpeg4videodec

Not merged, check_marker() is used in various other places in FFmpeg.

Merged-by: Clément Bœsch <u at pkh.me>

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