Merge commit 'd42ea06798b83d87397449ec6aad40cb5ea46e43'

* commit 'd42ea06798b83d87397449ec6aad40cb5ea46e43':
  codec_desc: add missing .long_name

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-14 19:23:57 +01:00
commit 4d10b93bd1

View File

@ -925,6 +925,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
.id = AV_CODEC_ID_V210X,
.type = AVMEDIA_TYPE_VIDEO,
.name = "v210x",
.long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"),
.props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS,
},
{
@ -1986,6 +1987,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
.id = AV_CODEC_ID_DVAUDIO,
.type = AVMEDIA_TYPE_AUDIO,
.name = "dvaudio",
.long_name = NULL_IF_CONFIG_SMALL("DVAUDIO"),
.props = AV_CODEC_PROP_LOSSY,
},
{