diff options
| author | Diego Biurrun <diego@biurrun.de> | 2013-10-03 22:57:53 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-10-03 23:32:01 +0200 |
| commit | b2bed9325dbd6be0da1d91ffed3f513c40274fd2 (patch) | |
| tree | c4794b7e2a2e20e18320ee577fd6261ccd5aed5a /libavcodec/mpegaudiodec.c | |
| parent | 49fe9c05f97bc2cfafd8fdcfea2f313d7c8e2c48 (diff) | |
cosmetics: Group .name and .long_name together in codec/format declarations
Diffstat (limited to 'libavcodec/mpegaudiodec.c')
| -rw-r--r-- | libavcodec/mpegaudiodec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index 423b4b06a1..0c702b054f 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec.c @@ -1975,6 +1975,7 @@ static int decode_frame_mp3on4(AVCodecContext *avctx, void *data, #if CONFIG_MP1_DECODER AVCodec ff_mp1_decoder = { .name = "mp1", + .long_name = NULL_IF_CONFIG_SMALL("MP1 (MPEG audio layer 1)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_MP1, .priv_data_size = sizeof(MPADecodeContext), @@ -1982,7 +1983,6 @@ AVCodec ff_mp1_decoder = { .decode = decode_frame, .capabilities = CODEC_CAP_DR1, .flush = flush, - .long_name = NULL_IF_CONFIG_SMALL("MP1 (MPEG audio layer 1)"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, @@ -1991,6 +1991,7 @@ AVCodec ff_mp1_decoder = { #if CONFIG_MP2_DECODER AVCodec ff_mp2_decoder = { .name = "mp2", + .long_name = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_MP2, .priv_data_size = sizeof(MPADecodeContext), @@ -1998,7 +1999,6 @@ AVCodec ff_mp2_decoder = { .decode = decode_frame, .capabilities = CODEC_CAP_DR1, .flush = flush, - .long_name = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, @@ -2007,6 +2007,7 @@ AVCodec ff_mp2_decoder = { #if CONFIG_MP3_DECODER AVCodec ff_mp3_decoder = { .name = "mp3", + .long_name = NULL_IF_CONFIG_SMALL("MP3 (MPEG audio layer 3)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_MP3, .priv_data_size = sizeof(MPADecodeContext), @@ -2014,7 +2015,6 @@ AVCodec ff_mp3_decoder = { .decode = decode_frame, .capabilities = CODEC_CAP_DR1, .flush = flush, - .long_name = NULL_IF_CONFIG_SMALL("MP3 (MPEG audio layer 3)"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, @@ -2023,6 +2023,7 @@ AVCodec ff_mp3_decoder = { #if CONFIG_MP3ADU_DECODER AVCodec ff_mp3adu_decoder = { .name = "mp3adu", + .long_name = NULL_IF_CONFIG_SMALL("ADU (Application Data Unit) MP3 (MPEG audio layer 3)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_MP3ADU, .priv_data_size = sizeof(MPADecodeContext), @@ -2030,7 +2031,6 @@ AVCodec ff_mp3adu_decoder = { .decode = decode_frame_adu, .capabilities = CODEC_CAP_DR1, .flush = flush, - .long_name = NULL_IF_CONFIG_SMALL("ADU (Application Data Unit) MP3 (MPEG audio layer 3)"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, @@ -2039,6 +2039,7 @@ AVCodec ff_mp3adu_decoder = { #if CONFIG_MP3ON4_DECODER AVCodec ff_mp3on4_decoder = { .name = "mp3on4", + .long_name = NULL_IF_CONFIG_SMALL("MP3onMP4"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_MP3ON4, .priv_data_size = sizeof(MP3On4DecodeContext), @@ -2047,7 +2048,6 @@ AVCodec ff_mp3on4_decoder = { .decode = decode_frame_mp3on4, .capabilities = CODEC_CAP_DR1, .flush = flush_mp3on4, - .long_name = NULL_IF_CONFIG_SMALL("MP3onMP4"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_NONE }, }; |