Skip to content

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

Merge commit '65ed9e75' 

* commit '65ed9e75':
  avconv: rename 'codec' to 'enc_ctx'

Conflicts:
	ffmpeg.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 1f40536c 65ed9e75
Expand all Show whitespace changes
Inline Side-by-side
Showing with 91 additions and 91 deletions
ffmpeg.c
View file @ 1efc0892
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