Skip to content

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

Merge commit 'bc3f0356' 

* commit 'bc3f0356':
  g2meet: rename FRAME_INFO to more appropriate DISPLAY_INFO

Conflicts:
	libavcodec/g2meet.c

See: cb2162adMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents ffe987b9 bc3f0356
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 0 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