Skip to content

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

Merge commit '650a5206' 

* commit '650a5206':
  avconv: rename 'icodec' to 'dec_ctx'

Conflicts:
	ffmpeg.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 42b7bda4 650a5206
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 48 deletions
ffmpeg.c
View file @ 1f40536c
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