Merge commit 'e4b38878da6b38ef5ca54ce14be985d6ae088834'
authorClément Bœsch <u@pkh.me>
Wed, 22 Jun 2016 17:57:11 +0000 (19:57 +0200)
committerClément Bœsch <u@pkh.me>
Wed, 22 Jun 2016 17:57:11 +0000 (19:57 +0200)
commit575be7311cff2c958ca289df408d3e9ce2e2b1c0
treec322202e0a64f71aee2d039e6a6c28799f4d790b
parent541e1c2c3b7cf11c6c504dc03cd9b0559dfff3df
parente4b38878da6b38ef5ca54ce14be985d6ae088834
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@pkh.me>