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

Merge commit 'eeadcdfd' 


* commit 'eeadcdfd':
  LucasArts SMUSH demuxer

Conflicts:
	Changelog
	doc/general.texi
	libavformat/smush.c
	libavformat/version.h

See: bef8fd70
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 787be6d0 eeadcdfd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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