Michael Niedermayer e37dbfddda Merge commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee' ...

* commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee':
  Silicon Graphics RLE 8-bit video decoder

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/avcodec.h
	libavcodec/sgirledec.c
	libavcodec/version.h

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

2014-04-19 19:26:46 +02:00

92 KiB

Raw Blame History

View Raw