[FFmpeg-cvslog] Merge commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr  6 23:24:21 2014 +0200| [5297003aa7a06e0223f3842b810d9fb10f67789d] | committer: Michael Niedermayer

Merge commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123'

* commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123':
  LucasArts SMUSH demuxer

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5297003aa7a06e0223f3842b810d9fb10f67789d
---