Merge commit '9a3202a98b2e095b54dd784c3e01a09a676fc3fa'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 3 Oct 2015 10:22:41 +0000 (12:22 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 3 Oct 2015 10:22:41 +0000 (12:22 +0200)
commit4d2160c99a00af98cb09749f24831580e816eda9
treecf897382bd18d139b6533f2fd889e25eee6eafbd
parent9825a24e5b1c34663d672961ebd2561a009b23e9
parent9a3202a98b2e095b54dd784c3e01a09a676fc3fa
Merge commit '9a3202a98b2e095b54dd784c3e01a09a676fc3fa'

* commit '9a3202a98b2e095b54dd784c3e01a09a676fc3fa':
  Screenpresso SPV1 decoder

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