Michael Niedermayer 5297003aa7 Merge commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123' ...

* commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123':
  LucasArts SMUSH demuxer

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

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

2014-04-06 23:29:47 +02:00

7.2 KiB

Raw Blame History

View Raw