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

Merge commit 'bb41115d' 


* commit 'bb41115d':
  imgutils: Do not declare avpriv_set_systematic_pal2 in the public header

Conflicts:
	libavutil/internal.h
	libavutil/version.h

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 71d008eb bb41115d
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