Skip to content
Snippets Groups Projects
Commit 5c43f3dd authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '31980b6a' 


* commit '31980b6a':
  vmd: decode videos with no LZ buffer size provided - they might not need it

Conflicts:
	libavcodec/vmdav.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents c3660c36 31980b6a
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 10 additions and 3 deletions
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