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

Merge commit 'c4abc909' 


* commit 'c4abc909':
  vqavideo: check the version

Conflicts:
	libavcodec/vqavideo.c

See: b226af39

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents f982d006 c4abc909
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 9 additions and 2 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