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

Merge commit '5e2ba41d' 


* commit '5e2ba41d':
  build: add avresample after avcodec to FFLIBS

Conflicts:
	Makefile

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents af31d58a 5e2ba41d
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 8 additions and 7 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