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)
* commit '3b8e895237592fdaffe87cdcd204104200b9ccf9':
  codec_desc: Add missing DXV entry

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

Simple merge