Commit 11e66d20 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '999d31d3'

* commit '999d31d3':
  codec_desc: K&R formatting cosmetics
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 56a498bb 999d31d3
...@@ -1972,14 +1972,14 @@ static const AVCodecDescriptor codec_descriptors[] = { ...@@ -1972,14 +1972,14 @@ static const AVCodecDescriptor codec_descriptors[] = {
.id = AV_CODEC_ID_DTS, .id = AV_CODEC_ID_DTS,
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
.name = "dts", .name = "dts",
.long_name = NULL_IF_CONFIG_SMALL("DCA (DTS Coherent Acoustics)"), .long_name = NULL_IF_CONFIG_SMALL("DCA (DTS Coherent Acoustics)"),
.props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS, .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS,
}, },
{ {
.id = AV_CODEC_ID_VORBIS, .id = AV_CODEC_ID_VORBIS,
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
.name = "vorbis", .name = "vorbis",
.long_name = NULL_IF_CONFIG_SMALL("Vorbis"), .long_name = NULL_IF_CONFIG_SMALL("Vorbis"),
.props = AV_CODEC_PROP_LOSSY, .props = AV_CODEC_PROP_LOSSY,
}, },
{ {
...@@ -2661,9 +2661,8 @@ const AVCodecDescriptor *avcodec_descriptor_get_by_name(const char *name) ...@@ -2661,9 +2661,8 @@ const AVCodecDescriptor *avcodec_descriptor_get_by_name(const char *name)
{ {
const AVCodecDescriptor *desc = NULL; const AVCodecDescriptor *desc = NULL;
while ((desc = avcodec_descriptor_next(desc))) { while ((desc = avcodec_descriptor_next(desc)))
if (!strcmp(desc->name, name)) if (!strcmp(desc->name, name))
return desc; return desc;
}
return NULL; return NULL;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment