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

Merge commit 'fd056029' 


* commit 'fd056029':
  lavc: add avcodec_free_context().

Conflicts:
	doc/APIchanges
	libavcodec/version.h

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents ff17d8b5 fd056029
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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