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

Merge commit 'd002fce2' 


* commit 'd002fce2':
  smacker: Check malloc return values

Conflicts:
	libavcodec/smacker.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents c16cd555 d002fce2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 35 additions and 16 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