Merge commit 'c45fcf30cfab687004ed1cdc06ebaa21f4262a0b'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 7 Sep 2015 14:07:07 +0000 (16:07 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 7 Sep 2015 14:07:07 +0000 (16:07 +0200)
commitd02d208211eb9a9de2e082942d007d558b2ce110
tree04aa6c6fcc585e23e022e3916eb0d62cb916408c
parentaea611dc3e9e8e40c43b2b89f1af957c383cb0f3
parentc45fcf30cfab687004ed1cdc06ebaa21f4262a0b
Merge commit 'c45fcf30cfab687004ed1cdc06ebaa21f4262a0b'

* commit 'c45fcf30cfab687004ed1cdc06ebaa21f4262a0b':
  DXV decoder

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
15 files changed:
Changelog
configure
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/dxv.c
libavcodec/utils.c
libavcodec/version.h
libavformat/isom.c
tests/fate/video.mak
tests/ref/fate/dxv-dxt1
tests/ref/fate/dxv-dxt5
tests/ref/fate/dxv3-dxt1
tests/ref/fate/dxv3-dxt5