[FFmpeg-cvslog] Merge commit '55ddd700c67529ff2c6c4e976673f1341bba7a82'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 19 20:15:27 2014 +0200| [01a39a978c143747b50d0b2660cd100c96722cbd] | committer: Michael Niedermayer

Merge commit '55ddd700c67529ff2c6c4e976673f1341bba7a82'

* commit '55ddd700c67529ff2c6c4e976673f1341bba7a82':
  Silicon Graphics Movie demuxer

Conflicts:
	Changelog
	libavformat/mvdec.c
	libavformat/version.h

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

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