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

Merge commit 'c342132f' 


* commit 'c342132f':
  frame: copy flags in av_frame_copy_props()

Conflicts:
	libavutil/frame.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents f3acdd44 c342132f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 0 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