Skip to content

F
ffmpeg.wasm-core
Commit 3597d32e authored by James Almer's avatar James Almer
Browse files
Options

Merge commit '6ed0f70f' 

* commit '6ed0f70f':
  avconv: factor out initializing stream parameters for streamcopy

Conflicts:
    ffmpeg.c
Merged-by: 's avatarJames Almer <jamrial@gmail.com>
parents df2ae8f3 6ed0f70f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 158 additions and 145 deletions
ffmpeg.c
View file @ 3597d32e
This diff is collapsed.
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