Merge commit '3b8e895237592fdaffe87cdcd204104200b9ccf9'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 9 Sep 2015 07:55:14 +0000 (09:55 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 9 Sep 2015 07:55:14 +0000 (09:55 +0200)
commitb421455ee09982b403a2b3428d2b01c835663ed7
treed2e4fc601b469530246c8930be4fcb1086d78d93
parente407d70f8359f01d74d52f543a371a1ae2ebb778
parent3b8e895237592fdaffe87cdcd204104200b9ccf9
Merge commit '3b8e895237592fdaffe87cdcd204104200b9ccf9'

* commit '3b8e895237592fdaffe87cdcd204104200b9ccf9':
  codec_desc: Add missing DXV entry

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