Skip to content

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

Merge commit '9a26ba97' 

* commit '9a26ba97':
  v4l2: Add support for h264

Conflicts:
	libavdevice/v4l2.c

See: 0fb79f30Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents cde6e328 9a26ba97
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