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

Merge commit 'a10c4ce2' 


* commit 'a10c4ce2':
  aac: Forward errors properly in aac_decode_frame_int

Conflicts:
	libavcodec/aacdec.c

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