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

Merge commit '0f0d1d05' 


* commit '0f0d1d05':
  configure: Always use -DOPJ_STATIC when checking for openjpeg

Conflicts:
	configure

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 802e5fc8 0f0d1d05
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment