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

Merge commit '5d839778' 


* commit '5d839778':
  lavu: Refactor side data wiping

Conflicts:
	libavutil/frame.c

See: a400edbb
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 1137ccef 5d839778
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 14 additions and 9 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