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

Merge commit 'e55e8b2c' 


* commit 'e55e8b2c':
  lavc: do not leak frames in avcodec_decode_audio4

Conflicts:
	libavcodec/utils.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 9818bbde e55e8b2c
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 9 additions and 10 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