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)
commitb3bf41cb75d434b2622433a96dcb617a58e9fca6
tree02e7f6a63fb8f6a9fbb1ef16f4bddca0a946821c
parent7255cf003ef17c5223d6748f25be592ba30933f0
parentc5e5e6306223623de8352a3ecd224956aa5beb37
Merge commit 'c5e5e6306223623de8352a3ecd224956aa5beb37'

* commit 'c5e5e6306223623de8352a3ecd224956aa5beb37':
  riff: Add support for RV40 codec in AVI

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