Merge commit 'c5e5e6306223623de8352a3ecd224956aa5beb37'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 13:31:29 +0000 (15:31 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 13:31:29 +0000 (15:31 +0200)
* commit 'c5e5e6306223623de8352a3ecd224956aa5beb37':
  riff: Add support for RV40 codec in AVI

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Trivial merge