aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/libgsm.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2013-10-03 22:57:53 +0200
committerDiego Biurrun <diego@biurrun.de>2013-10-03 23:32:01 +0200
commitb2bed9325dbd6be0da1d91ffed3f513c40274fd2 (patch)
treec4794b7e2a2e20e18320ee577fd6261ccd5aed5a /libavcodec/libgsm.c
parent49fe9c05f97bc2cfafd8fdcfea2f313d7c8e2c48 (diff)
downloadffmpeg-b2bed9325dbd6be0da1d91ffed3f513c40274fd2.tar.gz
cosmetics: Group .name and .long_name together in codec/format declarations
Diffstat (limited to 'libavcodec/libgsm.c')
-rw-r--r--libavcodec/libgsm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/libgsm.c b/libavcodec/libgsm.c
index ddf7b2367d..dfab005074 100644
--- a/libavcodec/libgsm.c
+++ b/libavcodec/libgsm.c
@@ -114,6 +114,7 @@ static int libgsm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
AVCodec ff_libgsm_encoder = {
.name = "libgsm",
+ .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"),
.type = AVMEDIA_TYPE_AUDIO,
.id = AV_CODEC_ID_GSM,
.init = libgsm_encode_init,
@@ -121,11 +122,11 @@ AVCodec ff_libgsm_encoder = {
.close = libgsm_encode_close,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_NONE },
- .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"),
};
AVCodec ff_libgsm_ms_encoder = {
.name = "libgsm_ms",
+ .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"),
.type = AVMEDIA_TYPE_AUDIO,
.id = AV_CODEC_ID_GSM_MS,
.init = libgsm_encode_init,
@@ -133,7 +134,6 @@ AVCodec ff_libgsm_ms_encoder = {
.close = libgsm_encode_close,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_NONE },
- .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"),
};
typedef struct LibGSMDecodeContext {
@@ -221,6 +221,7 @@ static void libgsm_flush(AVCodecContext *avctx) {
AVCodec ff_libgsm_decoder = {
.name = "libgsm",
+ .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"),
.type = AVMEDIA_TYPE_AUDIO,
.id = AV_CODEC_ID_GSM,
.priv_data_size = sizeof(LibGSMDecodeContext),
@@ -229,11 +230,11 @@ AVCodec ff_libgsm_decoder = {
.decode = libgsm_decode_frame,
.flush = libgsm_flush,
.capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"),
};
AVCodec ff_libgsm_ms_decoder = {
.name = "libgsm_ms",
+ .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"),
.type = AVMEDIA_TYPE_AUDIO,
.id = AV_CODEC_ID_GSM_MS,
.priv_data_size = sizeof(LibGSMDecodeContext),
@@ -242,5 +243,4 @@ AVCodec ff_libgsm_ms_decoder = {
.decode = libgsm_decode_frame,
.flush = libgsm_flush,
.capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"),
};