Skip to content

F
ffmpeg.wasm-core
Commit 58f70f17 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

Merge commit 'df7aba52' 

* commit 'df7aba52':
  frame: cosmetics, reindent

Conflicts:
	libavutil/frame.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 3f5f955c df7aba52
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 23 deletions
Markdown is supported
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