Michael Niedermayer 0c67ef2729 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: 746b1dcc98
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-04-19 19:47:58 +02:00

174 KiB

Raw Blame History

View Raw