From: Clément Bœsch <u@pkh.me>
Date: Wed, 22 Jun 2016 17:57:11 +0000 (+0200)
Subject: Merge commit 'e4b38878da6b38ef5ca54ce14be985d6ae088834'
X-Git-Tag: android-x86-7.1-r1~4736
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=575be7311cff2c958ca289df408d3e9ce2e2b1c0;p=android-x86%2Fexternal-ffmpeg.git

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

575be7311cff2c958ca289df408d3e9ce2e2b1c0