Skip to content

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

Merge commit '6d78e852' 

* commit '6d78e852':
  img2: add j2c file extension

Conflicts:
	libavformat/img2enc.c

See: e8df1827Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents c738ffcf 6d78e852
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