Commit 852dcf33 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'd6d78518'

* commit 'd6d78518':
  g2meet: factor out seeking to the chunk end

Conflicts:
	libavcodec/g2meet.c

See: 3f826039Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 6c12b1de d6d78518
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