Skip to content

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

Merge commit '781d97fd' 

* commit '781d97fd':
  avconv: remove unused nb_frames_dup

Conflicts:
	ffmpeg.c

No change, as the variable is not unused
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 15fe694e 781d97fd
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