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

Merge commit '074a1b37' 


* commit '074a1b37':
  aacpsy: Check memory allocation

Conflicts:
	libavcodec/aacpsy.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 0f69f02e 074a1b37
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 6 additions and 0 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