[FFmpeg-cvslog] Merge commit '86a0432688216562926d4aee36118f01be6d5e1b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 19 19:47:18 2014 +0200| [0c67ef272943c10decb9243c95fc209a7d3f2e12] | committer: Michael Niedermayer

Merge commit '86a0432688216562926d4aee36118f01be6d5e1b'

* commit '86a0432688216562926d4aee36118f01be6d5e1b':
  Silicon Graphics Motion Video Compressor 1 & 2 decoder

Conflicts:
	Changelog
	libavcodec/avcodec.h
	libavcodec/mvcdec.c
	libavcodec/version.h

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

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