Merge commit 'fb2889691cb7720d2680e188eb6036a35afa2392'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 26 Sep 2015 09:13:48 +0000 (11:13 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 26 Sep 2015 09:13:48 +0000 (11:13 +0200)
* commit 'fb2889691cb7720d2680e188eb6036a35afa2392':
  dxv: Support the original first version

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavcodec/dxv.c

Simple merge