Skip to content

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

Merge commit '58e65e44' 

* commit '58e65e44':
  vc1dsp: Add wrappers for {avg|put}_vc1_mspel_mc00_c

Conflicts:
	libavcodec/vc1dsp.c

See: 319235c6Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 2904d052 58e65e44
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