Commit 575be731 authored by Clément Bœsch's avatar Clément Bœsch

Merge commit 'e4b38878'

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

Not merged, check_marker() is used in various other places in FFmpeg.
Merged-by: 's avatarClément Bœsch <u@pkh.me>
parents 541e1c2c e4b38878
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment