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

Merge commit '45a1694f' 


* commit '45a1694f':
  jpeg2000dec: cleanup properly after decoding errors

Conflicts:
	libavcodec/jpeg2000dec.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents fc37cd43 45a1694f
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