* commit 'eeadcdfd':
  LucasArts SMUSH demuxer

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

See: bef8fd70Merged-by: Michael Niedermayer <michaelni@gmx.at>