Commit f18db82f authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '61cd19b8'

* commit '61cd19b8':
  vmnc: Port to bytestream2

Conflicts:
	libavcodec/vmnc.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 7824b5f6 61cd19b8
This diff is collapsed.
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