[FFmpeg-cvslog] Merge commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 19 19:12:57 2014 +0200| [e37dbfddda0380fd9ea9ba1bbae8a5ab2afc6573] | committer: Michael Niedermayer

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: afa1617b937f3675f74c6351a46c45f8c24d67f2
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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