Skip to content

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

Merge commit 'fd665f7f' 

* commit 'fd665f7f':
  avconv: Use the mpeg12 private option scan_offset

Conflicts:
	ffmpeg_opt.c

See: e479013aMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 27f2e211 fd665f7f
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