Skip to content
Snippets Groups Projects
Commit 42b8296f authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

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: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 3f545477 2578f1ef
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
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