Skip to content

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

Merge commit '2578f1ef' 

* commit '2578f1ef':
  riff: Support ULH0 and ULH2 fourccs.
  utvideodec: Support ULH0 and ULH2 formats.

Conflicts:
	libavcodec/utvideodec.c
	libavformat/riff.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 3f545477 2578f1ef
Show 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