Merge commit '533a6198505edd1379e1cd722852350ae4a85acc'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 27 Oct 2015 12:58:44 +0000 (13:58 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 27 Oct 2015 12:58:44 +0000 (13:58 +0100)
commit8b3228a329bb38671aee9c4434f2989d149732fe
treee6e60e471a3ff518e7b3d71f63197d44349ce768
parent8dde5dc05ae2fc4d4a5adc0a718631673b2af0f7
parent533a6198505edd1379e1cd722852350ae4a85acc
Merge commit '533a6198505edd1379e1cd722852350ae4a85acc'

* commit '533a6198505edd1379e1cd722852350ae4a85acc':
  innoHeim/Rsupport Screen Capture Codec decoder

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Changelog
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/rscc.c
libavcodec/version.h
libavformat/riff.c
tests/fate/screen.mak