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

Merge commit '8cb7b7b4' 


* commit '8cb7b7b4':
  movenc: Avoid leaking locally allocated data when returning on errors

Conflicts:
	libavformat/movenc.c

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