Michael Niedermayer 01a39a978c Merge commit '55ddd700c67529ff2c6c4e976673f1341bba7a82' ...

* commit '55ddd700c67529ff2c6c4e976673f1341bba7a82':
  Silicon Graphics Movie demuxer

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

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

2014-04-19 20:17:33 +02:00

15 KiB

Raw Blame History

View Raw