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

Merge commit '0a36988e' 


* commit '0a36988e':
  build: Let AMV decoder depend on the SP5X decoder

Conflicts:
	configure
	libavcodec/Makefile

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 5aab33de 0a36988e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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