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

Merge commit '1a3598aa' 


* commit '1a3598aa':
  jpeg2000: Use bytestream2

Conflicts:
	libavcodec/jpeg2000dec.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 26f6acc6 1a3598aa
No related branches found
No related tags 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