Skip to content

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

Merge commit '0cbb1473' 

* commit '0cbb1473':
  x264: Map color parameters

Conflicts:
	libavcodec/libx264.c

See: 48d39c87Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents fbdaebb2 0cbb1473
Show 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