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 | |
| parent | 49fe9c05f97bc2cfafd8fdcfea2f313d7c8e2c48 (diff) | |
| download | ffmpeg-b2bed9325dbd6be0da1d91ffed3f513c40274fd2.tar.gz | |
cosmetics: Group .name and .long_name together in codec/format declarations
267 files changed, 338 insertions, 338 deletions
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index 1489c32426..09336b0737 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -968,6 +968,7 @@ static av_cold int decode_end(AVCodecContext *avctx) AVCodec ff_fourxm_decoder = { .name = "4xm", + .long_name = NULL_IF_CONFIG_SMALL("4X Movie"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_4XM, .priv_data_size = sizeof(FourXContext), @@ -975,5 +976,4 @@ AVCodec ff_fourxm_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("4X Movie"), }; diff --git a/libavcodec/8bps.c b/libavcodec/8bps.c index 552e926c22..cfeb4867d1 100644 --- a/libavcodec/8bps.c +++ b/libavcodec/8bps.c @@ -187,11 +187,11 @@ static av_cold int decode_init(AVCodecContext *avctx) AVCodec ff_eightbps_decoder = { .name = "8bps", + .long_name = NULL_IF_CONFIG_SMALL("QuickTime 8BPS video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_8BPS, .priv_data_size = sizeof(EightBpsContext), .init = decode_init, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("QuickTime 8BPS video"), }; diff --git a/libavcodec/8svx.c b/libavcodec/8svx.c index 94eb319d3d..11fbf193ce 100644 --- a/libavcodec/8svx.c +++ b/libavcodec/8svx.c @@ -198,6 +198,7 @@ static av_cold int eightsvx_decode_close(AVCodecContext *avctx) AVCodec ff_eightsvx_fib_decoder = { .name = "8svx_fib", + .long_name = NULL_IF_CONFIG_SMALL("8SVX fibonacci"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_8SVX_FIB, .priv_data_size = sizeof (EightSvxContext), @@ -205,13 +206,13 @@ AVCodec ff_eightsvx_fib_decoder = { .close = eightsvx_decode_close, .decode = eightsvx_decode_frame, .capabilities = CODEC_CAP_DELAY | CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("8SVX fibonacci"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_U8P, AV_SAMPLE_FMT_NONE }, }; AVCodec ff_eightsvx_exp_decoder = { .name = "8svx_exp", + .long_name = NULL_IF_CONFIG_SMALL("8SVX exponential"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_8SVX_EXP, .priv_data_size = sizeof (EightSvxContext), @@ -219,13 +220,13 @@ AVCodec ff_eightsvx_exp_decoder = { .close = eightsvx_decode_close, .decode = eightsvx_decode_frame, .capabilities = CODEC_CAP_DELAY | CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("8SVX exponential"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_U8P, AV_SAMPLE_FMT_NONE }, }; AVCodec ff_pcm_s8_planar_decoder = { .name = "pcm_s8_planar", + .long_name = NULL_IF_CONFIG_SMALL("PCM signed 8-bit planar"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_PCM_S8_PLANAR, .priv_data_size = sizeof(EightSvxContext), @@ -233,7 +234,6 @@ AVCodec ff_pcm_s8_planar_decoder = { .close = eightsvx_decode_close, .decode = eightsvx_decode_frame, .capabilities = CODEC_CAP_DELAY | CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("PCM signed 8-bit planar"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_U8P, AV_SAMPLE_FMT_NONE }, }; diff --git a/libavcodec/a64multienc.c b/libavcodec/a64multienc.c index beddf9f9c3..f2c6c4a357 100644 --- a/libavcodec/a64multienc.c +++ b/libavcodec/a64multienc.c @@ -373,6 +373,7 @@ static int a64multi_encode_frame(AVCodecContext *avctx, AVPacket *pkt, AVCodec ff_a64multi_encoder = { .name = "a64multi", + .long_name = NULL_IF_CONFIG_SMALL("Multicolor charset for Commodore 64"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_A64_MULTI, .priv_data_size = sizeof(A64Context), @@ -380,12 +381,12 @@ AVCodec ff_a64multi_encoder = { .encode2 = a64multi_encode_frame, .close = a64multi_close_encoder, .pix_fmts = (const enum AVPixelFormat[]) {AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("Multicolor charset for Commodore 64"), .capabilities = CODEC_CAP_DELAY, }; AVCodec ff_a64multi5_encoder = { .name = "a64multi5", + .long_name = NULL_IF_CONFIG_SMALL("Multicolor charset for Commodore 64, extended with 5th color (colram)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_A64_MULTI5, .priv_data_size = sizeof(A64Context), @@ -393,6 +394,5 @@ AVCodec ff_a64multi5_encoder = { .encode2 = a64multi_encode_frame, .close = a64multi_close_encoder, .pix_fmts = (const enum AVPixelFormat[]) {AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("Multicolor charset for Commodore 64, extended with 5th color (colram)"), .capabilities = CODEC_CAP_DELAY, }; diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 35efb8c689..824839a772 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -3089,13 +3089,13 @@ static av_cold int latm_decode_init(AVCodecContext *avctx) AVCodec ff_aac_decoder = { .name = "aac", + .long_name = NULL_IF_CONFIG_SMALL("AAC (Advanced Audio Coding)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_AAC, .priv_data_size = sizeof(AACContext), .init = aac_decode_init, .close = aac_decode_close, .decode = aac_decode_frame, - .long_name = NULL_IF_CONFIG_SMALL("AAC (Advanced Audio Coding)"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, @@ -3110,13 +3110,13 @@ AVCodec ff_aac_decoder = { */ AVCodec ff_aac_latm_decoder = { .name = "aac_latm", + .long_name = NULL_IF_CONFIG_SMALL("AAC LATM (Advanced Audio Coding LATM syntax)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_AAC_LATM, .priv_data_size = sizeof(struct LATMContext), .init = latm_decode_init, .close = aac_decode_close, .decode = latm_decode_frame, - .long_name = NULL_IF_CONFIG_SMALL("AAC LATM (Advanced Audio Coding LATM syntax)"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index b2ad47bd75..55aa2f1a2f 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -804,6 +804,7 @@ static const AVClass aacenc_class = { AVCodec ff_aac_encoder = { .name = "aac", + .long_name = NULL_IF_CONFIG_SMALL("AAC (Advanced Audio Coding)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_AAC, .priv_data_size = sizeof(AACEncContext), @@ -814,6 +815,5 @@ AVCodec ff_aac_encoder = { CODEC_CAP_EXPERIMENTAL, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("AAC (Advanced Audio Coding)"), .priv_class = &aacenc_class, }; diff --git a/libavcodec/aasc.c b/libavcodec/aasc.c index 60a4be817b..468e39440a 100644 --- a/libavcodec/aasc.c +++ b/libavcodec/aasc.c @@ -111,6 +111,7 @@ static av_cold int aasc_decode_end(AVCodecContext *avctx) AVCodec ff_aasc_decoder = { .name = "aasc", + .long_name = NULL_IF_CONFIG_SMALL("Autodesk RLE"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_AASC, .priv_data_size = sizeof(AascContext), @@ -118,5 +119,4 @@ AVCodec ff_aasc_decoder = { .close = aasc_decode_end, .decode = aasc_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Autodesk RLE"), }; diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 406acb680d..fd0bf339a7 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -1439,6 +1439,7 @@ static const AVClass ac3_decoder_class = { AVCodec ff_ac3_decoder = { .name = "ac3", + .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_AC3, .priv_data_size = sizeof (AC3DecodeContext), @@ -1446,7 +1447,6 @@ AVCodec ff_ac3_decoder = { .close = ac3_decode_end, .decode = ac3_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, .priv_class = &ac3_decoder_class, @@ -1462,6 +1462,7 @@ static const AVClass eac3_decoder_class = { AVCodec ff_eac3_decoder = { .name = "eac3", + .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52B (AC-3, E-AC-3)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_EAC3, .priv_data_size = sizeof (AC3DecodeContext), @@ -1469,7 +1470,6 @@ AVCodec ff_eac3_decoder = { .close = ac3_decode_end, .decode = ac3_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52B (AC-3, E-AC-3)"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, .priv_class = &eac3_decoder_class, diff --git a/libavcodec/ac3enc_fixed.c b/libavcodec/ac3enc_fixed.c index e471edf08c..6e251899d8 100644 --- a/libavcodec/ac3enc_fixed.c +++ b/libavcodec/ac3enc_fixed.c @@ -143,6 +143,7 @@ static av_cold int ac3_fixed_encode_init(AVCodecContext *avctx) AVCodec ff_ac3_fixed_encoder = { .name = "ac3_fixed", + .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_AC3, .priv_data_size = sizeof(AC3EncodeContext), @@ -151,7 +152,6 @@ AVCodec ff_ac3_fixed_encoder = { .close = ff_ac3_encode_close, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"), .priv_class = &ac3enc_class, .channel_layouts = ff_ac3_channel_layouts, .defaults = ac3_defaults, diff --git a/libavcodec/ac3enc_float.c b/libavcodec/ac3enc_float.c index a225d9b4bd..86a5cff95f 100644 --- a/libavcodec/ac3enc_float.c +++ b/libavcodec/ac3enc_float.c @@ -142,6 +142,7 @@ static CoefType calc_cpl_coord(CoefSumType energy_ch, CoefSumType energy_cpl) #if CONFIG_AC3_ENCODER AVCodec ff_ac3_encoder = { .name = "ac3", + .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_AC3, .priv_data_size = sizeof(AC3EncodeContext), @@ -150,7 +151,6 @@ AVCodec ff_ac3_encoder = { .close = ff_ac3_encode_close, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"), .priv_class = &ac3enc_class, .channel_layouts = ff_ac3_channel_layouts, .defaults = ac3_defaults, diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 8b203218d1..c6bc4d09d7 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -1292,13 +1292,13 @@ static const enum AVSampleFormat sample_fmts_both[] = { AV_SAMPLE_FMT_S16, #define ADPCM_DECODER(id_, sample_fmts_, name_, long_name_) \ AVCodec ff_ ## name_ ## _decoder = { \ .name = #name_, \ + .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ .type = AVMEDIA_TYPE_AUDIO, \ .id = id_, \ .priv_data_size = sizeof(ADPCMDecodeContext), \ .init = adpcm_decode_init, \ .decode = adpcm_decode_frame, \ .capabilities = CODEC_CAP_DR1, \ - .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ .sample_fmts = sample_fmts_, \ } diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 14b1257966..fb3ce0d24b 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -708,6 +708,7 @@ static const enum AVSampleFormat sample_fmts_p[] = { #define ADPCM_ENCODER(id_, name_, sample_fmts_, long_name_) \ AVCodec ff_ ## name_ ## _encoder = { \ .name = #name_, \ + .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ .type = AVMEDIA_TYPE_AUDIO, \ .id = id_, \ .priv_data_size = sizeof(ADPCMEncodeContext), \ @@ -715,7 +716,6 @@ AVCodec ff_ ## name_ ## _encoder = { \ .encode2 = adpcm_encode_frame, \ .close = adpcm_encode_close, \ .sample_fmts = sample_fmts_, \ - .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ } ADPCM_ENCODER(AV_CODEC_ID_ADPCM_IMA_QT, adpcm_ima_qt, sample_fmts_p, "ADPCM IMA QuickTime"); diff --git a/libavcodec/adxdec.c b/libavcodec/adxdec.c index 52216867cc..17d5becc2b 100644 --- a/libavcodec/adxdec.c +++ b/libavcodec/adxdec.c @@ -175,6 +175,7 @@ static void adx_decode_flush(AVCodecContext *avctx) AVCodec ff_adpcm_adx_decoder = { .name = "adpcm_adx", + .long_name = NULL_IF_CONFIG_SMALL("SEGA CRI ADX ADPCM"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_ADPCM_ADX, .priv_data_size = sizeof(ADXContext), @@ -182,7 +183,6 @@ AVCodec ff_adpcm_adx_decoder = { .decode = adx_decode_frame, .flush = adx_decode_flush, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("SEGA CRI ADX ADPCM"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_NONE }, }; diff --git a/libavcodec/adxenc.c b/libavcodec/adxenc.c index 47620a22dd..e730811744 100644 --- a/libavcodec/adxenc.c +++ b/libavcodec/adxenc.c @@ -160,6 +160,7 @@ static int adx_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, AVCodec ff_adpcm_adx_encoder = { .name = "adpcm_adx", + .long_name = NULL_IF_CONFIG_SMALL("SEGA CRI ADX ADPCM"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_ADPCM_ADX, .priv_data_size = sizeof(ADXContext), @@ -167,5 +168,4 @@ AVCodec ff_adpcm_adx_encoder = { .encode2 = adx_encode_frame, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("SEGA CRI ADX ADPCM"), }; diff --git a/libavcodec/aic.c b/libavcodec/aic.c index f295249f30..5981dd8002 100644 --- a/libavcodec/aic.c +++ b/libavcodec/aic.c @@ -469,6 +469,7 @@ static av_cold int aic_decode_close(AVCodecContext *avctx) AVCodec ff_aic_decoder = { .name = "aic", + .long_name = NULL_IF_CONFIG_SMALL("Apple Intermediate Codec"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_AIC, .priv_data_size = sizeof(AICContext), @@ -476,5 +477,4 @@ AVCodec ff_aic_decoder = { .close = aic_decode_close, .decode = aic_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Apple Intermediate Codec") }; diff --git a/libavcodec/alac.c b/libavcodec/alac.c index 6d1ace36c4..f972531195 100644 --- a/libavcodec/alac.c +++ b/libavcodec/alac.c @@ -571,6 +571,7 @@ static av_cold int alac_decode_init(AVCodecContext * avctx) AVCodec ff_alac_decoder = { .name = "alac", + .long_name = NULL_IF_CONFIG_SMALL("ALAC (Apple Lossless Audio Codec)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_ALAC, .priv_data_size = sizeof(ALACContext), @@ -578,5 +579,4 @@ AVCodec ff_alac_decoder = { .close = alac_decode_close, .decode = alac_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("ALAC (Apple Lossless Audio Codec)"), }; diff --git a/libavcodec/alacenc.c b/libavcodec/alacenc.c index 0143240588..5fbcbfcd14 100644 --- a/libavcodec/alacenc.c +++ b/libavcodec/alacenc.c @@ -643,6 +643,7 @@ static int alac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, AVCodec ff_alac_encoder = { .name = "alac", + .long_name = NULL_IF_CONFIG_SMALL("ALAC (Apple Lossless Audio Codec)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_ALAC, .priv_data_size = sizeof(AlacEncodeContext), @@ -654,5 +655,4 @@ AVCodec ff_alac_encoder = { .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S32P, AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("ALAC (Apple Lossless Audio Codec)"), }; diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c index b1e61b037c..d4f103bd60 100644 --- a/libavcodec/alsdec.c +++ b/libavcodec/alsdec.c @@ -1766,6 +1766,7 @@ static av_cold void flush(AVCodecContext *avctx) AVCodec ff_als_decoder = { .name = "als", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 Audio Lossless Coding (ALS)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_MP4ALS, .priv_data_size = sizeof(ALSDecContext), @@ -1774,5 +1775,4 @@ AVCodec ff_als_decoder = { .decode = decode_frame, .flush = flush, .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 Audio Lossless Coding (ALS)"), }; diff --git a/libavcodec/amrnbdec.c b/libavcodec/amrnbdec.c index fcaaab386f..7692cf01c6 100644 --- a/libavcodec/amrnbdec.c +++ b/libavcodec/amrnbdec.c @@ -1064,13 +1064,13 @@ static int amrnb_decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_amrnb_decoder = { .name = "amrnb", + .long_name = NULL_IF_CONFIG_SMALL("AMR-NB (Adaptive Multi-Rate NarrowBand)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_AMR_NB, .priv_data_size = sizeof(AMRContext), .init = amrnb_decode_init, .decode = amrnb_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("AMR-NB (Adaptive Multi-Rate NarrowBand)"), .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_NONE }, }; diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c index c875d81995..668c84d1f3 100644 --- a/libavcodec/amrwbdec.c +++ b/libavcodec/amrwbdec.c @@ -1248,13 +1248,13 @@ static int amrwb_decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_amrwb_decoder = { .name = "amrwb", + .long_name = NULL_IF_CONFIG_SMALL("AMR-WB (Adaptive Multi-Rate WideBand)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_AMR_WB, .priv_data_size = sizeof(AMRWBContext), .init = amrwb_decode_init, .decode = amrwb_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("AMR-WB (Adaptive Multi-Rate WideBand)"), .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_NONE }, }; diff --git a/libavcodec/anm.c b/libavcodec/anm.c index 1c4c7e2497..3d5affbd63 100644 --- a/libavcodec/anm.c +++ b/libavcodec/anm.c @@ -191,6 +191,7 @@ static av_cold int decode_end(AVCodecContext *avctx) AVCodec ff_anm_decoder = { .name = "anm", + .long_name = NULL_IF_CONFIG_SMALL("Deluxe Paint Animation"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_ANM, .priv_data_size = sizeof(AnmContext), @@ -198,5 +199,4 @@ AVCodec ff_anm_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Deluxe Paint Animation"), }; diff --git a/libavcodec/ansi.c b/libavcodec/ansi.c index c851d88891..ae67f3c2e7 100644 --- a/libavcodec/ansi.c +++ b/libavcodec/ansi.c @@ -435,6 +435,7 @@ static av_cold int decode_close(AVCodecContext *avctx) AVCodec ff_ansi_decoder = { .name = "ansi", + .long_name = NULL_IF_CONFIG_SMALL("ASCII/ANSI art"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_ANSI, .priv_data_size = sizeof(AnsiContext), @@ -442,5 +443,4 @@ AVCodec ff_ansi_decoder = { .close = decode_close, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("ASCII/ANSI art"), }; diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c index 26056239fd..8669db8805 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -1564,6 +1564,7 @@ static const AVClass ape_decoder_class = { AVCodec ff_ape_decoder = { .name = "ape", + .long_name = NULL_IF_CONFIG_SMALL("Monkey's Audio"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_APE, .priv_data_size = sizeof(APEContext), @@ -1572,7 +1573,6 @@ AVCodec ff_ape_decoder = { .decode = ape_decode_frame, .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DELAY | CODEC_CAP_DR1, .flush = ape_flush, - .long_name = NULL_IF_CONFIG_SMALL("Monkey's Audio"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_U8P, AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_S32P, diff --git a/libavcodec/asvdec.c b/libavcodec/asvdec.c index 9ba2755717..f160434000 100644 --- a/libavcodec/asvdec.c +++ b/libavcodec/asvdec.c @@ -314,6 +314,7 @@ static av_cold int decode_end(AVCodecContext *avctx) AVCodec ff_asv1_decoder = { .name = "asv1", + .long_name = NULL_IF_CONFIG_SMALL("ASUS V1"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_ASV1, .priv_data_size = sizeof(ASV1Context), @@ -321,11 +322,11 @@ AVCodec ff_asv1_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("ASUS V1"), }; AVCodec ff_asv2_decoder = { .name = "asv2", + .long_name = NULL_IF_CONFIG_SMALL("ASUS V2"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_ASV2, .priv_data_size = sizeof(ASV1Context), @@ -333,6 +334,5 @@ AVCodec ff_asv2_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("ASUS V2"), }; diff --git a/libavcodec/asvenc.c b/libavcodec/asvenc.c index 2f48f73ff6..9dd5e08312 100644 --- a/libavcodec/asvenc.c +++ b/libavcodec/asvenc.c @@ -264,6 +264,7 @@ static av_cold int encode_init(AVCodecContext *avctx){ #if CONFIG_ASV1_ENCODER AVCodec ff_asv1_encoder = { .name = "asv1", + .long_name = NULL_IF_CONFIG_SMALL("ASUS V1"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_ASV1, .priv_data_size = sizeof(ASV1Context), @@ -271,13 +272,13 @@ AVCodec ff_asv1_encoder = { .encode2 = encode_frame, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("ASUS V1"), }; #endif #if CONFIG_ASV2_ENCODER AVCodec ff_asv2_encoder = { .name = "asv2", + .long_name = NULL_IF_CONFIG_SMALL("ASUS V2"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_ASV2, .priv_data_size = sizeof(ASV1Context), @@ -285,6 +286,5 @@ AVCodec ff_asv2_encoder = { .encode2 = encode_frame, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("ASUS V2"), }; #endif diff --git a/libavcodec/aura.c b/libavcodec/aura.c index b51aedeccf..a32c18b363 100644 --- a/libavcodec/aura.c +++ b/libavcodec/aura.c @@ -101,10 +101,10 @@ static int aura_decode_frame(AVCodecContext *avctx, AVCodec ff_aura2_decoder = { .name = "aura2", + .long_name = NULL_IF_CONFIG_SMALL("Auravision Aura 2"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_AURA2, .init = aura_decode_init, .decode = aura_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Auravision Aura 2"), }; diff --git a/libavcodec/avs.c b/libavcodec/avs.c index da27e0013f..6ff6d26be3 100644 --- a/libavcodec/avs.c +++ b/libavcodec/avs.c @@ -175,6 +175,7 @@ static av_cold int avs_decode_end(AVCodecContext *avctx) AVCodec ff_avs_decoder = { .name = "avs", + .long_name = NULL_IF_CONFIG_SMALL("AVS (Audio Video Standard) video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_AVS, .priv_data_size = sizeof(AvsContext), @@ -182,5 +183,4 @@ AVCodec ff_avs_decoder = { .decode = avs_decode_frame, .close = avs_decode_end, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("AVS (Audio Video Standard) video"), }; diff --git a/libavcodec/bethsoftvideo.c b/libavcodec/bethsoftvideo.c index b113bc44e7..1914d6b32f 100644 --- a/libavcodec/bethsoftvideo.c +++ b/libavcodec/bethsoftvideo.c @@ -152,6 +152,7 @@ static av_cold int bethsoftvid_decode_end(AVCodecContext *avctx) AVCodec ff_bethsoftvid_decoder = { .name = "bethsoftvid", + .long_name = NULL_IF_CONFIG_SMALL("Bethesda VID video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_BETHSOFTVID, .priv_data_size = sizeof(BethsoftvidContext), @@ -159,5 +160,4 @@ AVCodec ff_bethsoftvid_decoder = { .close = bethsoftvid_decode_end, .decode = bethsoftvid_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Bethesda VID video"), }; diff --git a/libavcodec/bfi.c b/libavcodec/bfi.c index 10544c5569..75b6710189 100644 --- a/libavcodec/bfi.c +++ b/libavcodec/bfi.c @@ -173,6 +173,7 @@ static av_cold int bfi_decode_close(AVCodecContext *avctx) AVCodec ff_bfi_decoder = { .name = "bfi", + .long_name = NULL_IF_CONFIG_SMALL("Brute Force & Ignorance"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_BFI, .priv_data_size = sizeof(BFIContext), @@ -180,5 +181,4 @@ AVCodec ff_bfi_decoder = { .close = bfi_decode_close, .decode = bfi_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Brute Force & Ignorance"), }; diff --git a/libavcodec/bink.c b/libavcodec/bink.c index 98a54c6969..005754291d 100644 --- a/libavcodec/bink.c +++ b/libavcodec/bink.c @@ -1338,12 +1338,12 @@ static av_cold int decode_end(AVCodecContext *avctx) AVCodec ff_bink_decoder = { .name = "binkvideo", + .long_name = NULL_IF_CONFIG_SMALL("Bink video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_BINKVIDEO, .priv_data_size = sizeof(BinkContext), .init = decode_init, .close = decode_end, .decode = decode_frame, - .long_name = NULL_IF_CONFIG_SMALL("Bink video"), .capabilities = CODEC_CAP_DR1, }; diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c index d49964b554..ddaa613ae4 100644 --- a/libavcodec/binkaudio.c +++ b/libavcodec/binkaudio.c @@ -337,6 +337,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_binkaudio_rdft_decoder = { .name = "binkaudio_rdft", + .long_name = NULL_IF_CONFIG_SMALL("Bink Audio (RDFT)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_BINKAUDIO_RDFT, .priv_data_size = sizeof(BinkAudioContext), @@ -344,11 +345,11 @@ AVCodec ff_binkaudio_rdft_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DELAY | CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Bink Audio (RDFT)") }; AVCodec ff_binkaudio_dct_decoder = { .name = "binkaudio_dct", + .long_name = NULL_IF_CONFIG_SMALL("Bink Audio (DCT)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_BINKAUDIO_DCT, .priv_data_size = sizeof(BinkAudioContext), @@ -356,5 +357,4 @@ AVCodec ff_binkaudio_dct_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DELAY | CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Bink Audio (DCT)") }; diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c index 899fc8a1dc..e5f7ebb0c5 100644 --- a/libavcodec/bmp.c +++ b/libavcodec/bmp.c @@ -341,9 +341,9 @@ static int bmp_decode_frame(AVCodecContext *avctx, AVCodec ff_bmp_decoder = { .name = "bmp", + .long_name = NULL_IF_CONFIG_SMALL("BMP (Windows and OS/2 bitmap)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_BMP, .decode = bmp_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("BMP (Windows and OS/2 bitmap)"), }; diff --git a/libavcodec/bmpenc.c b/libavcodec/bmpenc.c index d27282dc13..44e18cc193 100644 --- a/libavcodec/bmpenc.c +++ b/libavcodec/bmpenc.c @@ -161,6 +161,7 @@ static int bmp_encode_frame(AVCodecContext *avctx, AVPacket *pkt, AVCodec ff_bmp_encoder = { .name = "bmp", + .long_name = NULL_IF_CONFIG_SMALL("BMP (Windows and OS/2 bitmap)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_BMP, .priv_data_size = sizeof(BMPContext), @@ -173,5 +174,4 @@ AVCodec ff_bmp_encoder = { AV_PIX_FMT_MONOBLACK, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("BMP (Windows and OS/2 bitmap)"), }; diff --git a/libavcodec/bmv.c b/libavcodec/bmv.c index 941051ba7f..3c017d0e7e 100644 --- a/libavcodec/bmv.c +++ b/libavcodec/bmv.c @@ -337,21 +337,21 @@ static int bmv_aud_decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_bmv_video_decoder = { .name = "bmv_video", + .long_name = NULL_IF_CONFIG_SMALL("Discworld II BMV video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_BMV_VIDEO, .priv_data_size = sizeof(BMVDecContext), .init = decode_init, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Discworld II BMV video"), }; AVCodec ff_bmv_audio_decoder = { .name = "bmv_audio", + .long_name = NULL_IF_CONFIG_SMALL("Discworld II BMV audio"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_BMV_AUDIO, .init = bmv_aud_decode_init, .decode = bmv_aud_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Discworld II BMV audio"), }; diff --git a/libavcodec/c93.c b/libavcodec/c93.c index b534669ca2..d1f8629d81 100644 --- a/libavcodec/c93.c +++ b/libavcodec/c93.c @@ -247,6 +247,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_c93_decoder = { .name = "c93", + .long_name = NULL_IF_CONFIG_SMALL("Interplay C93"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_C93, .priv_data_size = sizeof(C93DecoderContext), @@ -254,5 +255,4 @@ AVCodec ff_c93_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Interplay C93"), }; diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index e91ff6c877..a4d291f5af 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -1193,6 +1193,7 @@ static int cavs_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVCodec ff_cavs_decoder = { .name = "cavs", + .long_name = NULL_IF_CONFIG_SMALL("Chinese AVS (Audio Video Standard) (AVS1-P2, JiZhun profile)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_CAVS, .priv_data_size = sizeof(AVSContext), @@ -1201,5 +1202,4 @@ AVCodec ff_cavs_decoder = { .decode = cavs_decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY, .flush = cavs_flush, - .long_name = NULL_IF_CONFIG_SMALL("Chinese AVS (Audio Video Standard) (AVS1-P2, JiZhun profile)"), }; diff --git a/libavcodec/cdgraphics.c b/libavcodec/cdgraphics.c index 8be14602c3..b8a6fb845b 100644 --- a/libavcodec/cdgraphics.c +++ b/libavcodec/cdgraphics.c @@ -368,6 +368,7 @@ static av_cold int cdg_decode_end(AVCodecContext *avctx) AVCodec ff_cdgraphics_decoder = { .name = "cdgraphics", + .long_name = NULL_IF_CONFIG_SMALL("CD Graphics video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_CDGRAPHICS, .priv_data_size = sizeof(CDGraphicsContext), @@ -375,5 +376,4 @@ AVCodec ff_cdgraphics_decoder = { .close = cdg_decode_end, .decode = cdg_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("CD Graphics video"), }; diff --git a/libavcodec/cdxl.c b/libavcodec/cdxl.c index ea52a0c304..b198c4ca0a 100644 --- a/libavcodec/cdxl.c +++ b/libavcodec/cdxl.c @@ -292,6 +292,7 @@ static av_cold int cdxl_decode_end(AVCodecContext *avctx) AVCodec ff_cdxl_decoder = { .name = "cdxl", + .long_name = NULL_IF_CONFIG_SMALL("Commodore CDXL video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_CDXL, .priv_data_size = sizeof(CDXLVideoContext), @@ -299,5 +300,4 @@ AVCodec ff_cdxl_decoder = { .close = cdxl_decode_end, .decode = cdxl_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Commodore CDXL video"), }; diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c index dff1b53792..3167a23eb5 100644 --- a/libavcodec/cinepak.c +++ b/libavcodec/cinepak.c @@ -468,6 +468,7 @@ static av_cold int cinepak_decode_end(AVCodecContext *avctx) AVCodec ff_cinepak_decoder = { .name = "cinepak", + .long_name = NULL_IF_CONFIG_SMALL("Cinepak"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_CINEPAK, .priv_data_size = sizeof(CinepakContext), @@ -475,5 +476,4 @@ AVCodec ff_cinepak_decoder = { .close = cinepak_decode_end, .decode = cinepak_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Cinepak"), }; diff --git a/libavcodec/cljr.c b/libavcodec/cljr.c index 7e189cd12d..f6dbb768a0 100644 --- a/libavcodec/cljr.c +++ b/libavcodec/cljr.c @@ -88,12 +88,12 @@ static av_cold int decode_init(AVCodecContext *avctx) AVCodec ff_cljr_decoder = { .name = "cljr", + .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_CLJR, .init = decode_init, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"), }; #endif @@ -152,6 +152,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, AVCodec ff_cljr_encoder = { .name = "cljr", + .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_CLJR, .priv_data_size = sizeof(CLJRContext), @@ -159,6 +160,5 @@ AVCodec ff_cljr_encoder = { .encode2 = encode_frame, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV411P, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"), }; #endif diff --git a/libavcodec/cllc.c b/libavcodec/cllc.c index 0e42c05173..6818f9f11c 100644 --- a/libavcodec/cllc.c +++ b/libavcodec/cllc.c @@ -490,6 +490,7 @@ static av_cold int cllc_decode_init(AVCodecContext *avctx) AVCodec ff_cllc_decoder = { .name = "cllc", + .long_name = NULL_IF_CONFIG_SMALL("Canopus Lossless Codec"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_CLLC, .priv_data_size = sizeof(CLLCContext), @@ -497,5 +498,4 @@ AVCodec ff_cllc_decoder = { .decode = cllc_decode_frame, .close = cllc_decode_close, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Canopus Lossless Codec"), }; diff --git a/libavcodec/cngdec.c b/libavcodec/cngdec.c index a9b3ba0a75..89f5c81f10 100644 --- a/libavcodec/cngdec.c +++ b/libavcodec/cngdec.c @@ -159,6 +159,7 @@ static int cng_decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_comfortnoise_decoder = { .name = "comfortnoise", + .long_name = NULL_IF_CONFIG_SMALL("RFC 3389 comfort noise generator"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_COMFORT_NOISE, .priv_data_size = sizeof(CNGContext), @@ -166,7 +167,6 @@ AVCodec ff_comfortnoise_decoder = { .decode = cng_decode_frame, .flush = cng_decode_flush, .close = cng_decode_close, - .long_name = NULL_IF_CONFIG_SMALL("RFC 3389 comfort noise generator"), .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, .capabilities = CODEC_CAP_DELAY | CODEC_CAP_DR1, diff --git a/libavcodec/cngenc.c b/libavcodec/cngenc.c index a553a3f924..98f3c4e91a 100644 --- a/libavcodec/cngenc.c +++ b/libavcodec/cngenc.c @@ -104,13 +104,13 @@ static int cng_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, AVCodec ff_comfortnoise_encoder = { .name = "comfortnoise", + .long_name = NULL_IF_CONFIG_SMALL("RFC 3389 comfort noise generator"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_COMFORT_NOISE, .priv_data_size = sizeof(CNGContext), .init = cng_encode_init, .encode2 = cng_encode_frame, .close = cng_encode_close, - .long_name = NULL_IF_CONFIG_SMALL("RFC 3389 comfort noise generator"), .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, }; diff --git a/libavcodec/cook.c b/libavcodec/cook.c index 90d78eb3f5..190d28c340 100644 --- a/libavcodec/cook.c +++ b/libavcodec/cook.c @@ -1255,6 +1255,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx) AVCodec ff_cook_decoder = { .name = "cook", + .long_name = NULL_IF_CONFIG_SMALL("Cook / Cooker / Gecko (RealAudio G2)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_COOK, .priv_data_size = sizeof(COOKContext), @@ -1262,7 +1263,6 @@ AVCodec ff_cook_decoder = { .close = cook_decode_close, .decode = cook_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Cook / Cooker / Gecko (RealAudio G2)"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, }; diff --git a/libavcodec/cscd.c b/libavcodec/cscd.c index 6b8d144f76..9ae7e33c7a 100644 --- a/libavcodec/cscd.c +++ b/libavcodec/cscd.c @@ -249,6 +249,7 @@ static av_cold int decode_end(AVCodecContext *avctx) { AVCodec ff_cscd_decoder = { .name = "camstudio", + .long_name = NULL_IF_CONFIG_SMALL("CamStudio"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_CSCD, .priv_data_size = sizeof(CamStudioContext), @@ -256,5 +257,4 @@ AVCodec ff_cscd_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("CamStudio"), }; diff --git a/libavcodec/cyuv.c b/libavcodec/cyuv.c index 9011bc2cfd..f628ba1828 100644 --- a/libavcodec/cyuv.c +++ b/libavcodec/cyuv.c @@ -166,25 +166,25 @@ static int cyuv_decode_frame(AVCodecContext *avctx, #if CONFIG_AURA_DECODER AVCodec ff_aura_decoder = { .name = "aura", + .long_name = NULL_IF_CONFIG_SMALL("Auravision AURA"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_AURA, .priv_data_size = sizeof(CyuvDecodeContext), .init = cyuv_decode_init, .decode = cyuv_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Auravision AURA"), }; #endif #if CONFIG_CYUV_DECODER AVCodec ff_cyuv_decoder = { .name = "cyuv", + .long_name = NULL_IF_CONFIG_SMALL("Creative YUV (CYUV)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_CYUV, .priv_data_size = sizeof(CyuvDecodeContext), .init = cyuv_decode_init, .decode = cyuv_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Creative YUV (CYUV)"), }; #endif diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index 2676c5904f..c80bd81baa 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -1949,13 +1949,13 @@ static const AVProfile profiles[] = { AVCodec ff_dca_decoder = { .name = "dca", + .long_name = NULL_IF_CONFIG_SMALL("DCA (DTS Coherent Acoustics)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_DTS, .priv_data_size = sizeof(DCAContext), .init = dca_decode_init, .decode = dca_decode_frame, .close = dca_decode_end, - .long_name = NULL_IF_CONFIG_SMALL("DCA (DTS Coherent Acoustics)"), .capabilities = CODEC_CAP_CHANNEL_CONF | CODEC_CAP_DR1, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, diff --git a/libavcodec/dfa.c b/libavcodec/dfa.c index 2828af6e56..ab65fdcb0e 100644 --- a/libavcodec/dfa.c +++ b/libavcodec/dfa.c @@ -394,6 +394,7 @@ static av_cold int dfa_decode_end(AVCodecContext *avctx) AVCodec ff_dfa_decoder = { .name = "dfa", + .long_name = NULL_IF_CONFIG_SMALL("Chronomaster DFA"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_DFA, .priv_data_size = sizeof(DfaContext), @@ -401,5 +402,4 @@ AVCodec ff_dfa_decoder = { .close = dfa_decode_end, .decode = dfa_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Chronomaster DFA"), }; diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c index 0a8bc59423..f7b8a22fec 100644 --- a/libavcodec/dnxhddec.c +++ b/libavcodec/dnxhddec.c @@ -385,6 +385,7 @@ static av_cold int dnxhd_decode_close(AVCodecContext *avctx) AVCodec ff_dnxhd_decoder = { .name = "dnxhd", + .long_name = NULL_IF_CONFIG_SMALL("VC3/DNxHD"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_DNXHD, .priv_data_size = sizeof(DNXHDContext), @@ -392,5 +393,4 @@ AVCodec ff_dnxhd_decoder = { .close = dnxhd_decode_close, .decode = dnxhd_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("VC3/DNxHD"), }; diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index c834ec3515..d71186dd06 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -1020,6 +1020,7 @@ static av_cold int dnxhd_encode_end(AVCodecContext *avctx) AVCodec ff_dnxhd_encoder = { .name = "dnxhd", + .long_name = NULL_IF_CONFIG_SMALL("VC3/DNxHD"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_DNXHD, .priv_data_size = sizeof(DNXHDEncContext), @@ -1030,6 +1031,5 @@ AVCodec ff_dnxhd_encoder = { .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("VC3/DNxHD"), .priv_class = &class, }; diff --git a/libavcodec/dpcm.c b/libavcodec/dpcm.c index 88b7bd8207..5ab2331601 100644 --- a/libavcodec/dpcm.c +++ b/libavcodec/dpcm.c @@ -327,13 +327,13 @@ static int dpcm_decode_frame(AVCodecContext *avctx, void *data, #define DPCM_DECODER(id_, name_, long_name_) \ AVCodec ff_ ## name_ ## _decoder = { \ .name = #name_, \ + .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ .type = AVMEDIA_TYPE_AUDIO, \ .id = id_, \ .priv_data_size = sizeof(DPCMContext), \ .init = dpcm_decode_init, \ .decode = dpcm_decode_frame, \ .capabilities = CODEC_CAP_DR1, \ - .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ } DPCM_DECODER(AV_CODEC_ID_INTERPLAY_DPCM, interplay_dpcm, "DPCM Interplay"); diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c index c1e83046f6..da7457d753 100644 --- a/libavcodec/dpx.c +++ b/libavcodec/dpx.c @@ -210,9 +210,9 @@ static int decode_frame(AVCodecContext *avctx, AVCodec ff_dpx_decoder = { .name = "dpx", + .long_name = NULL_IF_CONFIG_SMALL("DPX image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_DPX, .decode = decode_frame, - .long_name = NULL_IF_CONFIG_SMALL("DPX image"), .capabilities = CODEC_CAP_DR1, }; diff --git a/libavcodec/dpxenc.c b/libavcodec/dpxenc.c index d2631615a1..83a70a614a 100644 --- a/libavcodec/dpxenc.c +++ b/libavcodec/dpxenc.c @@ -175,6 +175,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, AVCodec ff_dpx_encoder = { .name = "dpx", + .long_name = NULL_IF_CONFIG_SMALL("DPX image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_DPX, .priv_data_size = sizeof(DPXContext), @@ -186,5 +187,4 @@ AVCodec ff_dpx_encoder = { AV_PIX_FMT_RGB48LE, AV_PIX_FMT_RGB48BE, AV_PIX_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("DPX image"), }; diff --git a/libavcodec/dsicinav.c b/libavcodec/dsicinav.c index 85148ea5ae..4d157b4655 100644 --- a/libavcodec/dsicinav.c +++ b/libavcodec/dsicinav.c @@ -384,6 +384,7 @@ static int cinaudio_decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_dsicinvideo_decoder = { .name = "dsicinvideo", + .long_name = NULL_IF_CONFIG_SMALL("Delphine Software International CIN video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_DSICINVIDEO, .priv_data_size = sizeof(CinVideoContext), @@ -391,16 +392,15 @@ AVCodec ff_dsicinvideo_decoder = { .close = cinvideo_decode_end, .decode = cinvideo_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Delphine Software International CIN video"), }; AVCodec ff_dsicinaudio_decoder = { .name = "dsicinaudio", + .long_name = NULL_IF_CONFIG_SMALL("Delphine Software International CIN audio"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_DSICINAUDIO, .priv_data_size = sizeof(CinAudioContext), .init = cinaudio_decode_init, .decode = cinaudio_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Delphine Software International CIN audio"), }; diff --git a/libavcodec/dv.c b/libavcodec/dv.c index f85a65b7ca..0e76944159 100644 --- a/libavcodec/dv.c +++ b/libavcodec/dv.c @@ -974,6 +974,7 @@ static int dvvideo_encode_frame(AVCodecContext *c, AVPacket *pkt, AVCodec ff_dvvideo_encoder = { .name = "dvvideo", + .long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_DVVIDEO, .priv_data_size = sizeof(DVVideoContext), @@ -983,6 +984,5 @@ AVCodec ff_dvvideo_encoder = { .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"), }; #endif // CONFIG_DVVIDEO_ENCODER diff --git a/libavcodec/dvbsub.c b/libavcodec/dvbsub.c index 26d14bd363..de0808fff5 100644 --- a/libavcodec/dvbsub.c +++ b/libavcodec/dvbsub.c @@ -404,9 +404,9 @@ static int dvbsub_encode(AVCodecContext *avctx, AVCodec ff_dvbsub_encoder = { .name = "dvbsub", + .long_name = NULL_IF_CONFIG_SMALL("DVB subtitles"), .type = AVMEDIA_TYPE_SUBTITLE, .id = AV_CODEC_ID_DVB_SUBTITLE, .priv_data_size = sizeof(DVBSubtitleContext), .encode_sub = dvbsub_encode, - .long_name = NULL_IF_CONFIG_SMALL("DVB subtitles"), }; diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c index b4aba49f09..9eaedca198 100644 --- a/libavcodec/dvbsubdec.c +++ b/libavcodec/dvbsubdec.c @@ -1465,11 +1465,11 @@ static int dvbsub_decode(AVCodecContext *avctx, AVCodec ff_dvbsub_decoder = { .name = "dvbsub", + .long_name = NULL_IF_CONFIG_SMALL("DVB subtitles"), .type = AVMEDIA_TYPE_SUBTITLE, .id = AV_CODEC_ID_DVB_SUBTITLE, .priv_data_size = sizeof(DVBSubContext), .init = dvbsub_init_decoder, .close = dvbsub_close_decoder, .decode = dvbsub_decode, - .long_name = NULL_IF_CONFIG_SMALL("DVB subtitles"), }; diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c index cc9c232c60..4b7dfeebed 100644 --- a/libavcodec/dvdec.c +++ b/libavcodec/dvdec.c @@ -370,6 +370,7 @@ static int dvvideo_close(AVCodecContext *c) AVCodec ff_dvvideo_decoder = { .name = "dvvideo", + .long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_DVVIDEO, .priv_data_size = sizeof(DVVideoContext), @@ -377,5 +378,4 @@ AVCodec ff_dvvideo_decoder = { .close = dvvideo_close, .decode = dvvideo_decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_SLICE_THREADS, - .long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"), }; diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c index eadde3234f..3cc9022b7e 100644 --- a/libavcodec/dvdsubdec.c +++ b/libavcodec/dvdsubdec.c @@ -540,10 +540,10 @@ static av_cold int dvdsub_init(AVCodecContext *avctx) AVCodec ff_dvdsub_decoder = { .name = "dvdsub", + .long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"), .type = AVMEDIA_TYPE_SUBTITLE, .id = AV_CODEC_ID_DVD_SUBTITLE, .priv_data_size = sizeof(DVDSubContext), .init = dvdsub_init, .decode = dvdsub_decode, - .long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"), }; diff --git a/libavcodec/dvdsubenc.c b/libavcodec/dvdsubenc.c index 5e362b7f64..db6749e59d 100644 --- a/libavcodec/dvdsubenc.c +++ b/libavcodec/dvdsubenc.c @@ -217,8 +217,8 @@ static int dvdsub_encode(AVCodecContext *avctx, AVCodec ff_dvdsub_encoder = { .name = "dvdsub", + .long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"), .type = AVMEDIA_TYPE_SUBTITLE, .id = AV_CODEC_ID_DVD_SUBTITLE, .encode_sub = dvdsub_encode, - .long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"), }; diff --git a/libavcodec/dxa.c b/libavcodec/dxa.c index 30fd1cebc6..f32be99e7d 100644 --- a/libavcodec/dxa.c +++ b/libavcodec/dxa.c @@ -325,6 +325,7 @@ static av_cold int decode_end(AVCodecContext *avctx) AVCodec ff_dxa_decoder = { .name = "dxa", + .long_name = NULL_IF_CONFIG_SMALL("Feeble Files/ScummVM DXA"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_DXA, .priv_data_size = sizeof(DxaDecContext), @@ -332,5 +333,4 @@ AVCodec ff_dxa_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Feeble Files/ScummVM DXA"), }; diff --git a/libavcodec/eac3enc.c b/libavcodec/eac3enc.c index 69777fed11..c238fc133f 100644 --- a/libavcodec/eac3enc.c +++ b/libavcodec/eac3enc.c @@ -250,6 +250,7 @@ void ff_eac3_output_frame_header(AC3EncodeContext *s) #if CONFIG_EAC3_ENCODER AVCodec ff_eac3_encoder = { .name = "eac3", + .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52 E-AC-3"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_EAC3, .priv_data_size = sizeof(AC3EncodeContext), @@ -258,7 +259,6 @@ AVCodec ff_eac3_encoder = { .close = ff_ac3_encode_close, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52 E-AC-3"), .priv_class = &eac3enc_class, .channel_layouts = ff_ac3_channel_layouts, .defaults = ac3_defaults, diff --git a/libavcodec/eacmv.c b/libavcodec/eacmv.c index 6236bd2dd1..3b1256c254 100644 --- a/libavcodec/eacmv.c +++ b/libavcodec/eacmv.c @@ -220,6 +220,7 @@ static av_cold int cmv_decode_end(AVCodecContext *avctx){ AVCodec ff_eacmv_decoder = { .name = "eacmv", + .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts CMV video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_CMV, .priv_data_size = sizeof(CmvContext), @@ -227,5 +228,4 @@ AVCodec ff_eacmv_decoder = { .close = cmv_decode_end, .decode = cmv_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts CMV video"), }; diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c index d4c167b597..8d6aa626a1 100644 --- a/libavcodec/eamad.c +++ b/libavcodec/eamad.c @@ -306,6 +306,7 @@ static av_cold int decode_end(AVCodecContext *avctx) AVCodec ff_eamad_decoder = { .name = "eamad", + .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts Madcow Video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MAD, .priv_data_size = sizeof(MadContext), @@ -313,5 +314,4 @@ AVCodec ff_eamad_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts Madcow Video") }; diff --git a/libavcodec/eatgq.c b/libavcodec/eatgq.c index 9495066eff..0a3e0f6075 100644 --- a/libavcodec/eatgq.c +++ b/libavcodec/eatgq.c @@ -240,11 +240,11 @@ static int tgq_decode_frame(AVCodecContext *avctx, AVCodec ff_eatgq_decoder = { .name = "eatgq", + .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TGQ video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_TGQ, .priv_data_size = sizeof(TgqContext), .init = tgq_decode_init, .decode = tgq_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TGQ video"), }; diff --git a/libavcodec/eatgv.c b/libavcodec/eatgv.c index 1e0ec60bc5..fabc5167bb 100644 --- a/libavcodec/eatgv.c +++ b/libavcodec/eatgv.c @@ -341,12 +341,12 @@ static av_cold int tgv_decode_end(AVCodecContext *avctx) AVCodec ff_eatgv_decoder = { .name = "eatgv", + .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TGV video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_TGV, .priv_data_size = sizeof(TgvContext), .init = tgv_decode_init, .close = tgv_decode_end, .decode = tgv_decode_frame, - .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TGV video"), .capabilities = CODEC_CAP_DR1, }; diff --git a/libavcodec/eatqi.c b/libavcodec/eatqi.c index eba4b6f390..9f7ec4d743 100644 --- a/libavcodec/eatqi.c +++ b/libavcodec/eatqi.c @@ -148,6 +148,7 @@ static av_cold int tqi_decode_end(AVCodecContext *avctx) AVCodec ff_eatqi_decoder = { .name = "eatqi", + .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TQI Video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_TQI, .priv_data_size = sizeof(TqiContext), @@ -155,5 +156,4 @@ AVCodec ff_eatqi_decoder = { .close = tqi_decode_end, .decode = tqi_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TQI Video"), }; diff --git a/libavcodec/escape124.c b/libavcodec/escape124.c index b304dd8b39..4e4b9080e4 100644 --- a/libavcodec/escape124.c +++ b/libavcodec/escape124.c @@ -368,6 +368,7 @@ static int escape124_decode_frame(AVCodecContext *avctx, AVCodec ff_escape124_decoder = { .name = "escape124", + .long_name = NULL_IF_CONFIG_SMALL("Escape 124"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_ESCAPE124, .priv_data_size = sizeof(Escape124Context), @@ -375,5 +376,4 @@ AVCodec ff_escape124_decoder = { .close = escape124_decode_close, .decode = escape124_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Escape 124"), }; diff --git a/libavcodec/escape130.c b/libavcodec/escape130.c index abba965096..bc865a3b21 100644 --- a/libavcodec/escape130.c +++ b/libavcodec/escape130.c @@ -345,6 +345,7 @@ static int escape130_decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_escape130_decoder = { .name = "escape130", + .long_name = NULL_IF_CONFIG_SMALL("Escape 130"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_ESCAPE130, .priv_data_size = sizeof(Escape130Context), @@ -352,5 +353,4 @@ AVCodec ff_escape130_decoder = { .close = escape130_decode_close, .decode = escape130_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Escape 130"), }; diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 499407ead2..584755dfd2 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -908,6 +908,7 @@ static int ffv1_decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_ffv1_decoder = { .name = "ffv1", + .long_name = NULL_IF_CONFIG_SMALL("FFmpeg video codec #1"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_FFV1, .priv_data_size = sizeof(FFV1Context), @@ -916,5 +917,4 @@ AVCodec ff_ffv1_decoder = { .decode = ffv1_decode_frame, .capabilities = CODEC_CAP_DR1 /*| CODEC_CAP_DRAW_HORIZ_BAND*/ | CODEC_CAP_SLICE_THREADS, - .long_name = NULL_IF_CONFIG_SMALL("FFmpeg video codec #1"), }; diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index b0c79b932f..1aec37bcef 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -1076,6 +1076,7 @@ static const AVCodecDefault ffv1_defaults[] = { AVCodec ff_ffv1_encoder = { .name = "ffv1", + .long_name = NULL_IF_CONFIG_SMALL("FFmpeg video codec #1"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_FFV1, .priv_data_size = sizeof(FFV1Context), @@ -1096,7 +1097,6 @@ AVCodec ff_ffv1_encoder = { AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("FFmpeg video codec #1"), .defaults = ffv1_defaults, .priv_class = &class, }; diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index 3286379e81..0305d50e30 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -557,6 +557,7 @@ static av_cold int flac_decode_close(AVCodecContext *avctx) AVCodec ff_flac_decoder = { .name = "flac", + .long_name = NULL_IF_CONFIG_SMALL("FLAC (Free Lossless Audio Codec)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_FLAC, .priv_data_size = sizeof(FLACContext), @@ -564,7 +565,6 @@ AVCodec ff_flac_decoder = { .close = flac_decode_close, .decode = flac_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("FLAC (Free Lossless Audio Codec)"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_S32, diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c index 15b0e5530d..58e86be2d6 100644 --- a/libavcodec/flacenc.c +++ b/libavcodec/flacenc.c @@ -1318,6 +1318,7 @@ static const AVClass flac_encoder_class = { AVCodec ff_flac_encoder = { .name = "flac", + .long_name = NULL_IF_CONFIG_SMALL("FLAC (Free Lossless Audio Codec)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_FLAC, .priv_data_size = sizeof(FlacEncodeContext), @@ -1328,6 +1329,5 @@ AVCodec ff_flac_encoder = { .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("FLAC (Free Lossless Audio Codec)"), .priv_class = &flac_encoder_class, }; diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c index 2fbe221bfa..e9749fec33 100644 --- a/libavcodec/flashsv.c +++ b/libavcodec/flashsv.c @@ -468,6 +468,7 @@ static av_cold int flashsv_decode_end(AVCodecContext *avctx) #if CONFIG_FLASHSV_DECODER AVCodec ff_flashsv_decoder = { .name = "flashsv", + .long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video v1"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_FLASHSV, .priv_data_size = sizeof(FlashSVContext), @@ -476,7 +477,6 @@ AVCodec ff_flashsv_decoder = { .decode = flashsv_decode_frame, .capabilities = CODEC_CAP_DR1, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_BGR24, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video v1"), }; #endif /* CONFIG_FLASHSV_DECODER */ @@ -531,6 +531,7 @@ static av_cold int flashsv2_decode_end(AVCodecContext *avctx) AVCodec ff_flashsv2_decoder = { .name = "flashsv2", + .long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video v2"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_FLASHSV2, .priv_data_size = sizeof(FlashSVContext), @@ -539,6 +540,5 @@ AVCodec ff_flashsv2_decoder = { .decode = flashsv_decode_frame, .capabilities = CODEC_CAP_DR1, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_BGR24, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video v2"), }; #endif /* CONFIG_FLASHSV2_DECODER */ diff --git a/libavcodec/flashsvenc.c b/libavcodec/flashsvenc.c index 0b788802d6..bbfb41c899 100644 --- a/libavcodec/flashsvenc.c +++ b/libavcodec/flashsvenc.c @@ -281,6 +281,7 @@ static av_cold int flashsv_encode_end(AVCodecContext *avctx) AVCodec ff_flashsv_encoder = { .name = "flashsv", + .long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_FLASHSV, .priv_data_size = sizeof(FlashSVContext), @@ -288,5 +289,4 @@ AVCodec ff_flashsv_encoder = { .encode2 = flashsv_encode_frame, .close = flashsv_encode_end, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_BGR24, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video"), }; diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c index 9795ff960e..ff1d8201ac 100644 --- a/libavcodec/flicvideo.c +++ b/libavcodec/flicvideo.c @@ -740,6 +740,7 @@ static av_cold int flic_decode_end(AVCodecContext *avctx) AVCodec ff_flic_decoder = { .name = "flic", + .long_name = NULL_IF_CONFIG_SMALL("Autodesk Animator Flic video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_FLIC, .priv_data_size = sizeof(FlicDecodeContext), @@ -747,5 +748,4 @@ AVCodec ff_flic_decoder = { .close = flic_decode_end, .decode = flic_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Autodesk Animator Flic video"), }; diff --git a/libavcodec/flvdec.c b/libavcodec/flvdec.c index 3640d29847..665208adde 100644 --- a/libavcodec/flvdec.c +++ b/libavcodec/flvdec.c @@ -121,6 +121,7 @@ int ff_flv_decode_picture_header(MpegEncContext *s) AVCodec ff_flv_decoder = { .name = "flv", + .long_name = NULL_IF_CONFIG_SMALL("FLV / Sorenson Spark / Sorenson H.263 (Flash Video)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_FLV1, .priv_data_size = sizeof(MpegEncContext), @@ -128,6 +129,5 @@ AVCodec ff_flv_decoder = { .close = ff_h263_decode_end, .decode = ff_h263_decode_frame, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("FLV / Sorenson Spark / Sorenson H.263 (Flash Video)"), .pix_fmts = ff_pixfmt_list_420, }; diff --git a/libavcodec/flvenc.c b/libavcodec/flvenc.c index 5427cbcfc6..fbdb23d79b 100644 --- a/libavcodec/flvenc.c +++ b/libavcodec/flvenc.c @@ -88,6 +88,7 @@ FF_MPV_GENERIC_CLASS(flv) AVCodec ff_flv_encoder = { .name = "flv", + .long_name = NULL_IF_CONFIG_SMALL("FLV / Sorenson Spark / Sorenson H.263 (Flash Video)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_FLV1, .priv_data_size = sizeof(MpegEncContext), @@ -95,6 +96,5 @@ AVCodec ff_flv_encoder = { .encode2 = ff_MPV_encode_picture, .close = ff_MPV_encode_end, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("FLV / Sorenson Spark / Sorenson H.263 (Flash Video)"), .priv_class = &flv_class, }; diff --git a/libavcodec/fraps.c b/libavcodec/fraps.c index c172c6a2ba..438c215152 100644 --- a/libavcodec/fraps.c +++ b/libavcodec/fraps.c @@ -370,6 +370,7 @@ static av_cold int decode_end(AVCodecContext *avctx) AVCodec ff_fraps_decoder = { .name = "fraps", + .long_name = NULL_IF_CONFIG_SMALL("Fraps"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_FRAPS, .priv_data_size = sizeof(FrapsContext), @@ -377,5 +378,4 @@ AVCodec ff_fraps_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Fraps"), }; diff --git a/libavcodec/frwu.c b/libavcodec/frwu.c index 1323727b42..568b94f81b 100644 --- a/libavcodec/frwu.c +++ b/libavcodec/frwu.c @@ -96,10 +96,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVCodec ff_frwu_decoder = { .name = "frwu", + .long_name = NULL_IF_CONFIG_SMALL("Forward Uncompressed"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_FRWU, .init = decode_init, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Forward Uncompressed"), }; diff --git a/libavcodec/g722dec.c b/libavcodec/g722dec.c index 100dab2f9b..26aa6cfb91 100644 --- a/libavcodec/g722dec.c +++ b/libavcodec/g722dec.c @@ -140,12 +140,12 @@ static int g722_decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_adpcm_g722_decoder = { .name = "g722", + .long_name = NULL_IF_CONFIG_SMALL("G.722 ADPCM"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_ADPCM_G722, .priv_data_size = sizeof(G722Context), .init = g722_decode_init, .decode = g722_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("G.722 ADPCM"), .priv_class = &g722_decoder_class, }; diff --git a/libavcodec/g722enc.c b/libavcodec/g722enc.c index b168a92d55..e7b67dad4f 100644 --- a/libavcodec/g722enc.c +++ b/libavcodec/g722enc.c @@ -382,6 +382,7 @@ static int g722_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, AVCodec ff_adpcm_g722_encoder = { .name = "g722", + .long_name = NULL_IF_CONFIG_SMALL("G.722 ADPCM"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_ADPCM_G722, .priv_data_size = sizeof(G722Context), @@ -389,7 +390,6 @@ AVCodec ff_adpcm_g722_encoder = { .close = g722_encode_close, .encode2 = g722_encode_frame, .capabilities = CODEC_CAP_SMALL_LAST_FRAME, - .long_name = NULL_IF_CONFIG_SMALL("G.722 ADPCM"), .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, }; diff --git a/libavcodec/g723_1.c b/libavcodec/g723_1.c index 64b4e1fd4c..bbdb404a99 100644 --- a/libavcodec/g723_1.c +++ b/libavcodec/g723_1.c @@ -1367,12 +1367,12 @@ static const AVClass g723_1dec_class = { AVCodec ff_g723_1_decoder = { .name = "g723_1", + .long_name = NULL_IF_CONFIG_SMALL("G.723.1"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_G723_1, .priv_data_size = sizeof(G723_1_Context), .init = g723_1_decode_init, .decode = g723_1_decode_frame, - .long_name = NULL_IF_CONFIG_SMALL("G.723.1"), .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1, .priv_class = &g723_1dec_class, }; diff --git a/libavcodec/g726.c b/libavcodec/g726.c index 6db00feb31..62aeb797e8 100644 --- a/libavcodec/g726.c +++ b/libavcodec/g726.c @@ -384,6 +384,7 @@ static const AVCodecDefault defaults[] = { AVCodec ff_adpcm_g726_encoder = { .name = "g726", + .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_ADPCM_G726, .priv_data_size = sizeof(G726Context), @@ -392,7 +393,6 @@ AVCodec ff_adpcm_g726_encoder = { .capabilities = CODEC_CAP_SMALL_LAST_FRAME, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"), .priv_class = &class, .defaults = defaults, }; @@ -460,6 +460,7 @@ static void g726_decode_flush(AVCodecContext *avctx) AVCodec ff_adpcm_g726_decoder = { .name = "g726", + .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_ADPCM_G726, .priv_data_size = sizeof(G726Context), @@ -467,6 +468,5 @@ AVCodec ff_adpcm_g726_decoder = { .decode = g726_decode_frame, .flush = g726_decode_flush, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"), }; #endif diff --git a/libavcodec/gif.c b/libavcodec/gif.c index 8705e743da..4dc124f49b 100644 --- a/libavcodec/gif.c +++ b/libavcodec/gif.c @@ -181,6 +181,7 @@ static int gif_encode_close(AVCodecContext *avctx) AVCodec ff_gif_encoder = { .name = "gif", + .long_name = NULL_IF_CONFIG_SMALL("GIF (Graphics Interchange Format)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_GIF, .priv_data_size = sizeof(GIFContext), @@ -191,5 +192,4 @@ AVCodec ff_gif_encoder = { AV_PIX_FMT_RGB8, AV_PIX_FMT_BGR8, AV_PIX_FMT_RGB4_BYTE, AV_PIX_FMT_BGR4_BYTE, AV_PIX_FMT_GRAY8, AV_PIX_FMT_PAL8, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("GIF (Graphics Interchange Format)"), }; diff --git a/libavcodec/gifdec.c b/libavcodec/gifdec.c index d8a3b742a7..a233797717 100644 --- a/libavcodec/gifdec.c +++ b/libavcodec/gifdec.c @@ -319,6 +319,7 @@ static av_cold int gif_decode_close(AVCodecContext *avctx) AVCodec ff_gif_decoder = { .name = "gif", + .long_name = NULL_IF_CONFIG_SMALL("GIF (Graphics Interchange Format)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_GIF, .priv_data_size = sizeof(GifState), @@ -326,5 +327,4 @@ AVCodec ff_gif_decoder = { .close = gif_decode_close, .decode = gif_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("GIF (Graphics Interchange Format)"), }; diff --git a/libavcodec/gsmdec.c b/libavcodec/gsmdec.c index d67f0b49c0..642f3b711f 100644 --- a/libavcodec/gsmdec.c +++ b/libavcodec/gsmdec.c @@ -103,6 +103,7 @@ static void gsm_flush(AVCodecContext *avctx) AVCodec ff_gsm_decoder = { .name = "gsm", + .long_name = NULL_IF_CONFIG_SMALL("GSM"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_GSM, .priv_data_size = sizeof(GSMContext), @@ -110,11 +111,11 @@ AVCodec ff_gsm_decoder = { .decode = gsm_decode_frame, .flush = gsm_flush, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("GSM"), }; AVCodec ff_gsm_ms_decoder = { .name = "gsm_ms", + .long_name = NULL_IF_CONFIG_SMALL("GSM Microsoft variant"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_GSM_MS, .priv_data_size = sizeof(GSMContext), @@ -122,5 +123,4 @@ AVCodec ff_gsm_ms_decoder = { .decode = gsm_decode_frame, .flush = gsm_flush, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("GSM Microsoft variant"), }; diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 2832c622e8..f88831f084 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -661,6 +661,7 @@ static av_cold int h261_decode_end(AVCodecContext *avctx) AVCodec ff_h261_decoder = { .name = "h261", + .long_name = NULL_IF_CONFIG_SMALL("H.261"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_H261, .priv_data_size = sizeof(H261Context), @@ -668,5 +669,4 @@ AVCodec ff_h261_decoder = { .close = h261_decode_end, .decode = h261_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("H.261"), }; diff --git a/libavcodec/h261enc.c b/libavcodec/h261enc.c index 6a8d993abf..4cff99882a 100644 --- a/libavcodec/h261enc.c +++ b/libavcodec/h261enc.c @@ -326,6 +326,7 @@ FF_MPV_GENERIC_CLASS(h261) AVCodec ff_h261_encoder = { .name = "h261", + .long_name = NULL_IF_CONFIG_SMALL("H.261"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_H261, .priv_data_size = sizeof(H261Context), @@ -334,6 +335,5 @@ AVCodec ff_h261_encoder = { .close = ff_MPV_encode_end, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("H.261"), .priv_class = &h261_class, }; diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 24a48b3730..8a021d18d4 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -730,6 +730,7 @@ const enum AVPixelFormat ff_h263_hwaccel_pixfmt_list_420[] = { AVCodec ff_h263_decoder = { .name = "h263", + .long_name = NULL_IF_CONFIG_SMALL("H.263 / H.263-1996, H.263+ / H.263-1998 / H.263 version 2"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_H263, .priv_data_size = sizeof(MpegEncContext), @@ -739,6 +740,5 @@ AVCodec ff_h263_decoder = { .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, .flush = ff_mpeg_flush, - .long_name = NULL_IF_CONFIG_SMALL("H.263 / H.263-1996, H.263+ / H.263-1998 / H.263 version 2"), .pix_fmts = ff_h263_hwaccel_pixfmt_list_420, }; diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 5ff55ceccb..7311e6a54a 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -4879,6 +4879,7 @@ static const AVProfile profiles[] = { AVCodec ff_h264_decoder = { .name = "h264", + .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_H264, .priv_data_size = sizeof(H264Context), @@ -4889,7 +4890,6 @@ AVCodec ff_h264_decoder = { CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS | CODEC_CAP_FRAME_THREADS, .flush = flush_dpb, - .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"), .init_thread_copy = ONLY_IF_THREADS_ENABLED(decode_init_thread_copy), .update_thread_context = ONLY_IF_THREADS_ENABLED(decode_update_thread_context), .profiles = NULL_IF_CONFIG_SMALL(profiles), diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c index 7a58ba4688..ed490d4bd7 100644 --- a/libavcodec/huffyuvdec.c +++ b/libavcodec/huffyuvdec.c @@ -740,6 +740,7 @@ static av_cold int decode_end(AVCodecContext *avctx) #if CONFIG_HUFFYUV_DECODER AVCodec ff_huffyuv_decoder = { .name = "huffyuv", + .long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_HUFFYUV, .priv_data_size = sizeof(HYuvContext), @@ -749,13 +750,13 @@ AVCodec ff_huffyuv_decoder = { .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_FRAME_THREADS, .init_thread_copy = ONLY_IF_THREADS_ENABLED(decode_init_thread_copy), - .long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"), }; #endif #if CONFIG_FFVHUFF_DECODER AVCodec ff_ffvhuff_decoder = { .name = "ffvhuff", + .long_name = NULL_IF_CONFIG_SMALL("Huffyuv FFmpeg variant"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_FFVHUFF, .priv_data_size = sizeof(HYuvContext), @@ -765,6 +766,5 @@ AVCodec ff_ffvhuff_decoder = { .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_FRAME_THREADS, .init_thread_copy = ONLY_IF_THREADS_ENABLED(decode_init_thread_copy), - .long_name = NULL_IF_CONFIG_SMALL("Huffyuv FFmpeg variant"), }; #endif diff --git a/libavcodec/huffyuvenc.c b/libavcodec/huffyuvenc.c index 678304460c..665d0a68e0 100644 --- a/libavcodec/huffyuvenc.c +++ b/libavcodec/huffyuvenc.c @@ -682,6 +682,7 @@ static av_cold int encode_end(AVCodecContext *avctx) #if CONFIG_HUFFYUV_ENCODER AVCodec ff_huffyuv_encoder = { .name = "huffyuv", + .long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_HUFFYUV, .priv_data_size = sizeof(HYuvContext), @@ -692,13 +693,13 @@ AVCodec ff_huffyuv_encoder = { AV_PIX_FMT_YUV422P, AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"), }; #endif #if CONFIG_FFVHUFF_ENCODER AVCodec ff_ffvhuff_encoder = { .name = "ffvhuff", + .long_name = NULL_IF_CONFIG_SMALL("Huffyuv FFmpeg variant"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_FFVHUFF, .priv_data_size = sizeof(HYuvContext), @@ -709,6 +710,5 @@ AVCodec ff_ffvhuff_encoder = { AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Huffyuv FFmpeg variant"), }; #endif diff --git a/libavcodec/idcinvideo.c b/libavcodec/idcinvideo.c index 9d34f3e247..70c98d68e0 100644 --- a/libavcodec/idcinvideo.c +++ b/libavcodec/idcinvideo.c @@ -242,11 +242,11 @@ static int idcin_decode_frame(AVCodecContext *avctx, AVCodec ff_idcin_decoder = { .name = "idcinvideo", + .long_name = NULL_IF_CONFIG_SMALL("id Quake II CIN video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_IDCIN, .priv_data_size = sizeof(IdcinContext), .init = idcin_decode_init, .decode = idcin_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("id Quake II CIN video"), }; diff --git a/libavcodec/iff.c b/libavcodec/iff.c index bc878c50e3..1ee02bd506 100644 --- a/libavcodec/iff.c +++ b/libavcodec/iff.c @@ -369,6 +369,7 @@ static av_cold int decode_end(AVCodecContext *avctx) AVCodec ff_iff_ilbm_decoder = { .name = "iff_ilbm", + .long_name = NULL_IF_CONFIG_SMALL("IFF ILBM"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_IFF_ILBM, .priv_data_size = sizeof(IffContext), @@ -376,11 +377,11 @@ AVCodec ff_iff_ilbm_decoder = { .close = decode_end, .decode = decode_frame_ilbm, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("IFF ILBM"), }; AVCodec ff_iff_byterun1_decoder = { .name = "iff_byterun1", + .long_name = NULL_IF_CONFIG_SMALL("IFF ByteRun1"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_IFF_BYTERUN1, .priv_data_size = sizeof(IffContext), @@ -388,5 +389,4 @@ AVCodec ff_iff_byterun1_decoder = { .close = decode_end, .decode = decode_frame_byterun1, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("IFF ByteRun1"), }; diff --git a/libavcodec/imc.c b/libavcodec/imc.c index b803176761..c1fbd76fec 100644 --- a/libavcodec/imc.c +++ b/libavcodec/imc.c @@ -1047,6 +1047,7 @@ static av_cold int imc_decode_close(AVCodecContext * avctx) AVCodec ff_imc_decoder = { .name = "imc", + .long_name = NULL_IF_CONFIG_SMALL("IMC (Intel Music Coder)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_IMC, .priv_data_size = sizeof(IMCContext), @@ -1054,13 +1055,13 @@ AVCodec ff_imc_decoder = { .close = imc_decode_close, .decode = imc_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("IMC (Intel Music Coder)"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, }; AVCodec ff_iac_decoder = { .name = "iac", + .long_name = NULL_IF_CONFIG_SMALL("IAC (Indeo Audio Coder)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_IAC, .priv_data_size = sizeof(IMCContext), @@ -1068,7 +1069,6 @@ AVCodec ff_iac_decoder = { .close = imc_decode_close, .decode = imc_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("IAC (Indeo Audio Coder)"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, }; diff --git a/libavcodec/indeo2.c b/libavcodec/indeo2.c index a33bbb1fc9..67c2facba7 100644 --- a/libavcodec/indeo2.c +++ b/libavcodec/indeo2.c @@ -248,6 +248,7 @@ static av_cold int ir2_decode_end(AVCodecContext *avctx) AVCodec ff_indeo2_decoder = { .name = "indeo2", + .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo 2"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_INDEO2, .priv_data_size = sizeof(Ir2Context), @@ -255,5 +256,4 @@ AVCodec ff_indeo2_decoder = { .close = ir2_decode_end, .decode = ir2_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo 2"), }; diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c index f9bfc0eb5d..7cc870d5a0 100644 --- a/libavcodec/indeo3.c +++ b/libavcodec/indeo3.c @@ -1126,6 +1126,7 @@ static av_cold int decode_close(AVCodecContext *avctx) AVCodec ff_indeo3_decoder = { .name = "indeo3", + .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo 3"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_INDEO3, .priv_data_size = sizeof(Indeo3DecodeContext), @@ -1133,5 +1134,4 @@ AVCodec ff_indeo3_decoder = { .close = decode_close, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo 3"), }; diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c index fccb74f80a..042529f894 100644 --- a/libavcodec/indeo4.c +++ b/libavcodec/indeo4.c @@ -625,12 +625,12 @@ static av_cold int decode_init(AVCodecContext *avctx) AVCodec ff_indeo4_decoder = { .name = "indeo4", + .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo Video Interactive 4"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_INDEO4, .priv_data_size = sizeof(IVI45DecContext), .init = decode_init, .close = ff_ivi_decode_close, .decode = ff_ivi_decode_frame, - .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo Video Interactive 4"), .capabilities = CODEC_CAP_DR1, }; diff --git a/libavcodec/indeo5.c b/libavcodec/indeo5.c index 481a4a61e2..83bbcbbc1e 100644 --- a/libavcodec/indeo5.c +++ b/libavcodec/indeo5.c @@ -649,12 +649,12 @@ static av_cold int decode_init(AVCodecContext *avctx) AVCodec ff_indeo5_decoder = { .name = "indeo5", + .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo Video Interactive 5"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_INDEO5, .priv_data_size = sizeof(IVI45DecContext), .init = decode_init, .close = ff_ivi_decode_close, .decode = ff_ivi_decode_frame, - .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo Video Interactive 5"), .capabilities = CODEC_CAP_DR1, }; diff --git a/libavcodec/intelh263dec.c b/libavcodec/intelh263dec.c index 0701cde73e..78e3d52d89 100644 --- a/libavcodec/intelh263dec.c +++ b/libavcodec/intelh263dec.c @@ -126,6 +126,7 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s) AVCodec ff_h263i_decoder = { .name = "h263i", + .long_name = NULL_IF_CONFIG_SMALL("Intel H.263"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_H263I, .priv_data_size = sizeof(MpegEncContext), @@ -133,6 +134,5 @@ AVCodec ff_h263i_decoder = { .close = ff_h263_decode_end, .decode = ff_h263_decode_frame, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Intel H.263"), .pix_fmts = ff_pixfmt_list_420, }; diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c index b76fe6d50c..7d785e3764 100644 --- a/libavcodec/interplayvideo.c +++ b/libavcodec/interplayvideo.c @@ -1013,6 +1013,7 @@ static av_cold int ipvideo_decode_end(AVCodecContext *avctx) AVCodec ff_interplay_video_decoder = { .name = "interplayvideo", + .long_name = NULL_IF_CONFIG_SMALL("Interplay MVE video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_INTERPLAY_VIDEO, .priv_data_size = sizeof(IpvideoContext), @@ -1020,5 +1021,4 @@ AVCodec ff_interplay_video_decoder = { .close = ipvideo_decode_end, .decode = ipvideo_decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_PARAM_CHANGE, - .long_name = NULL_IF_CONFIG_SMALL("Interplay MVE video"), }; diff --git a/libavcodec/kgv1dec.c b/libavcodec/kgv1dec.c index 74ae6b7ffe..1774f36c3b 100644 --- a/libavcodec/kgv1dec.c +++ b/libavcodec/kgv1dec.c @@ -182,6 +182,7 @@ static av_cold int decode_end(AVCodecContext *avctx) AVCodec ff_kgv1_decoder = { .name = "kgv1", + .long_name = NULL_IF_CONFIG_SMALL("Kega Game Video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_KGV1, .priv_data_size = sizeof(KgvContext), @@ -189,6 +190,5 @@ AVCodec ff_kgv1_decoder = { .close = decode_end, .decode = decode_frame, .flush = decode_flush, - .long_name = NULL_IF_CONFIG_SMALL("Kega Game Video"), .capabilities = CODEC_CAP_DR1, }; diff --git a/libavcodec/kmvc.c b/libavcodec/kmvc.c index da181b5226..5da8bb27cc 100644 --- a/libavcodec/kmvc.c +++ b/libavcodec/kmvc.c @@ -400,11 +400,11 @@ static av_cold int decode_init(AVCodecContext * avctx) AVCodec ff_kmvc_decoder = { .name = "kmvc", + .long_name = NULL_IF_CONFIG_SMALL("Karl Morton's video codec"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_KMVC, .priv_data_size = sizeof(KmvcContext), .init = decode_init, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Karl Morton's video codec"), }; diff --git a/libavcodec/lagarith.c b/libavcodec/lagarith.c index 9d84d263c9..ce2942a5f6 100644 --- a/libavcodec/lagarith.c +++ b/libavcodec/lagarith.c @@ -683,6 +683,7 @@ static av_cold int lag_decode_end(AVCodecContext *avctx) AVCodec ff_lagarith_decoder = { .name = "lagarith", + .long_name = NULL_IF_CONFIG_SMALL("Lagarith lossless"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_LAGARITH, .priv_data_size = sizeof(LagarithContext), @@ -690,5 +691,4 @@ AVCodec ff_lagarith_decoder = { .close = lag_decode_end, .decode = lag_decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, - .long_name = NULL_IF_CONFIG_SMALL("Lagarith lossless"), }; diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c index 957143dd75..4d97948042 100644 --- a/libavcodec/lcldec.c +++ b/libavcodec/lcldec.c @@ -629,6 +629,7 @@ static av_cold int decode_end(AVCodecContext *avctx) #if CONFIG_MSZH_DECODER AVCodec ff_mszh_decoder = { .name = "mszh", + .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) MSZH"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MSZH, .priv_data_size = sizeof(LclDecContext), @@ -636,13 +637,13 @@ AVCodec ff_mszh_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) MSZH"), }; #endif #if CONFIG_ZLIB_DECODER AVCodec ff_zlib_decoder = { .name = "zlib", + .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) ZLIB"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_ZLIB, .priv_data_size = sizeof(LclDecContext), @@ -650,6 +651,5 @@ AVCodec ff_zlib_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) ZLIB"), }; #endif diff --git a/libavcodec/lclenc.c b/libavcodec/lclenc.c index 0fb303cca6..1f9f04676c 100644 --- a/libavcodec/lclenc.c +++ b/libavcodec/lclenc.c @@ -186,6 +186,7 @@ static av_cold int encode_end(AVCodecContext *avctx) AVCodec ff_zlib_encoder = { .name = "zlib", + .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) ZLIB"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_ZLIB, .priv_data_size = sizeof(LclEncContext), @@ -193,5 +194,4 @@ AVCodec ff_zlib_encoder = { .encode2 = encode_frame, .close = encode_end, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_BGR24, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) ZLIB"), }; diff --git a/libavcodec/libfaac.c b/libavcodec/libfaac.c index 6359344192..9b5b11af8a 100644 --- a/libavcodec/libfaac.c +++ b/libavcodec/libfaac.c @@ -225,6 +225,7 @@ static const uint64_t faac_channel_layouts[] = { AVCodec ff_libfaac_encoder = { .name = "libfaac", + .long_name = NULL_IF_CONFIG_SMALL("libfaac AAC (Advanced Audio Coding)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_AAC, .priv_data_size = sizeof(FaacAudioContext), @@ -234,7 +235,6 @@ AVCodec ff_libfaac_encoder = { .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("libfaac AAC (Advanced Audio Coding)"), .profiles = NULL_IF_CONFIG_SMALL(profiles), .channel_layouts = faac_channel_layouts, }; diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c index 49382628e5..48271692c4 100644 --- a/libavcodec/libfdk-aacenc.c +++ b/libavcodec/libfdk-aacenc.c @@ -396,6 +396,7 @@ static const int aac_sample_rates[] = { AVCodec ff_libfdk_aac_encoder = { .name = "libfdk_aac", + .long_name = NULL_IF_CONFIG_SMALL("Fraunhofer FDK AAC"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_AAC, .priv_data_size = sizeof(AACContext), @@ -405,7 +406,6 @@ AVCodec ff_libfdk_aac_encoder = { .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Fraunhofer FDK AAC"), .priv_class = &aac_enc_class, .defaults = aac_encode_defaults, .profiles = profiles, 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"), }; diff --git a/libavcodec/libilbc.c b/libavcodec/libilbc.c index 714fdb0210..af693bd728 100644 --- a/libavcodec/libilbc.c +++ b/libavcodec/libilbc.c @@ -105,13 +105,13 @@ static int ilbc_decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_libilbc_decoder = { .name = "libilbc", + .long_name = NULL_IF_CONFIG_SMALL("iLBC (Internet Low Bitrate Codec)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_ILBC, .priv_data_size = sizeof(ILBCDecContext), .init = ilbc_decode_init, .decode = ilbc_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("iLBC (Internet Low Bitrate Codec)"), .priv_class = &ilbc_dec_class, }; @@ -182,6 +182,7 @@ static const AVCodecDefault ilbc_encode_defaults[] = { AVCodec ff_libilbc_encoder = { .name = "libilbc", + .long_name = NULL_IF_CONFIG_SMALL("iLBC (Internet Low Bitrate Codec)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_ILBC, .priv_data_size = sizeof(ILBCEncContext), @@ -189,7 +190,6 @@ AVCodec ff_libilbc_encoder = { .encode2 = ilbc_encode_frame, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("iLBC (Internet Low Bitrate Codec)"), .defaults = ilbc_encode_defaults, .priv_class = &ilbc_enc_class, }; diff --git a/libavcodec/libmp3lame.c b/libavcodec/libmp3lame.c index 5e7caf8c0a..ce0e9c8534 100644 --- a/libavcodec/libmp3lame.c +++ b/libavcodec/libmp3lame.c @@ -285,6 +285,7 @@ static const int libmp3lame_sample_rates[] = { AVCodec ff_libmp3lame_encoder = { .name = "libmp3lame", + .long_name = NULL_IF_CONFIG_SMALL("libmp3lame MP3 (MPEG audio layer 3)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_MP3, .priv_data_size = sizeof(LAMEContext), @@ -300,7 +301,6 @@ AVCodec ff_libmp3lame_encoder = { .channel_layouts = (const uint64_t[]) { AV_CH_LAYOUT_MONO, AV_CH_LAYOUT_STEREO, 0 }, - .long_name = NULL_IF_CONFIG_SMALL("libmp3lame MP3 (MPEG audio layer 3)"), .priv_class = &libmp3lame_class, .defaults = libmp3lame_defaults, }; diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c index 1f71a5bf01..6b459590d7 100644 --- a/libavcodec/libopencore-amr.c +++ b/libavcodec/libopencore-amr.c @@ -129,6 +129,7 @@ static int amr_nb_decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_libopencore_amrnb_decoder = { .name = "libopencore_amrnb", + .long_name = NULL_IF_CONFIG_SMALL("OpenCORE AMR-NB (Adaptive Multi-Rate Narrow-Band)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_AMR_NB, .priv_data_size = sizeof(AMRContext), @@ -136,7 +137,6 @@ AVCodec ff_libopencore_amrnb_decoder = { .close = amr_nb_decode_close, .decode = amr_nb_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("OpenCORE AMR-NB (Adaptive Multi-Rate Narrow-Band)"), }; #endif /* CONFIG_LIBOPENCORE_AMRNB_DECODER */ @@ -284,6 +284,7 @@ static int amr_nb_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, AVCodec ff_libopencore_amrnb_encoder = { .name = "libopencore_amrnb", + .long_name = NULL_IF_CONFIG_SMALL("OpenCORE AMR-NB (Adaptive Multi-Rate Narrow-Band)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_AMR_NB, .priv_data_size = sizeof(AMRContext), @@ -293,7 +294,6 @@ AVCodec ff_libopencore_amrnb_encoder = { .capabilities = CODEC_CAP_DELAY | CODEC_CAP_SMALL_LAST_FRAME, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("OpenCORE AMR-NB (Adaptive Multi-Rate Narrow-Band)"), .priv_class = &class, }; #endif /* CONFIG_LIBOPENCORE_AMRNB_ENCODER */ @@ -367,6 +367,7 @@ static int amr_wb_decode_close(AVCodecContext *avctx) AVCodec ff_libopencore_amrwb_decoder = { .name = "libopencore_amrwb", + .long_name = NULL_IF_CONFIG_SMALL("OpenCORE AMR-WB (Adaptive Multi-Rate Wide-Band)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_AMR_WB, .priv_data_size = sizeof(AMRWBContext), @@ -374,7 +375,6 @@ AVCodec ff_libopencore_amrwb_decoder = { .close = amr_wb_decode_close, .decode = amr_wb_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("OpenCORE AMR-WB (Adaptive Multi-Rate Wide-Band)"), }; #endif /* CONFIG_LIBOPENCORE_AMRWB_DECODER */ diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c index 9ff1429d0a..ca824c659b 100644 --- a/libavcodec/libopenjpegdec.c +++ b/libavcodec/libopenjpegdec.c @@ -428,12 +428,12 @@ static const AVClass class = { AVCodec ff_libopenjpeg_decoder = { .name = "libopenjpeg", + .long_name = NULL_IF_CONFIG_SMALL("OpenJPEG JPEG 2000"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_JPEG2000, .priv_data_size = sizeof(LibOpenJPEGContext), .init = libopenjpeg_decode_init, .decode = libopenjpeg_decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, - .long_name = NULL_IF_CONFIG_SMALL("OpenJPEG JPEG 2000"), .priv_class = &class, }; diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c index 09b115bb60..f2f98cd2c2 100644 --- a/libavcodec/libopenjpegenc.c +++ b/libavcodec/libopenjpegenc.c @@ -413,6 +413,7 @@ static const AVClass class = { AVCodec ff_libopenjpeg_encoder = { .name = "libopenjpeg", + .long_name = NULL_IF_CONFIG_SMALL("OpenJPEG JPEG 2000"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_JPEG2000, .priv_data_size = sizeof(LibOpenJPEGContext), @@ -431,6 +432,5 @@ AVCodec ff_libopenjpeg_encoder = { AV_PIX_FMT_YUV420P16, AV_PIX_FMT_YUV422P16, AV_PIX_FMT_YUV444P16, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("OpenJPEG JPEG 2000"), .priv_class = &class, }; diff --git a/libavcodec/libopusdec.c b/libavcodec/libopusdec.c index 8c33e91a74..398450f4d4 100644 --- a/libavcodec/libopusdec.c +++ b/libavcodec/libopusdec.c @@ -152,6 +152,7 @@ static void libopus_flush(AVCodecContext *avc) AVCodec ff_libopus_decoder = { .name = "libopus", + .long_name = NULL_IF_CONFIG_SMALL("libopus Opus"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_OPUS, .priv_data_size = sizeof(struct libopus_context), @@ -160,7 +161,6 @@ AVCodec ff_libopus_decoder = { .decode = libopus_decode, .flush = libopus_flush, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("libopus Opus"), .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, diff --git a/libavcodec/libopusenc.c b/libavcodec/libopusenc.c index f124e190d9..592b8caf4b 100644 --- a/libavcodec/libopusenc.c +++ b/libavcodec/libopusenc.c @@ -403,6 +403,7 @@ static const int libopus_sample_rates[] = { AVCodec ff_libopus_encoder = { .name = "libopus", + .long_name = NULL_IF_CONFIG_SMALL("libopus Opus"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_OPUS, .priv_data_size = sizeof(LibopusEncContext), @@ -415,7 +416,6 @@ AVCodec ff_libopus_encoder = { AV_SAMPLE_FMT_NONE }, .channel_layouts = ff_vorbis_channel_layouts, .supported_samplerates = libopus_sample_rates, - .long_name = NULL_IF_CONFIG_SMALL("libopus Opus"), .priv_class = &libopus_class, .defaults = libopus_defaults, }; diff --git a/libavcodec/libschroedingerdec.c b/libavcodec/libschroedingerdec.c index 7fedc63221..7e258e3f98 100644 --- a/libavcodec/libschroedingerdec.c +++ b/libavcodec/libschroedingerdec.c @@ -378,6 +378,7 @@ static void libschroedinger_flush(AVCodecContext *avctx) AVCodec ff_libschroedinger_decoder = { .name = "libschroedinger", + .long_name = NULL_IF_CONFIG_SMALL("libschroedinger Dirac 2.2"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_DIRAC, .priv_data_size = sizeof(SchroDecoderParams), @@ -386,5 +387,4 @@ AVCodec ff_libschroedinger_decoder = { .decode = libschroedinger_decode_frame, .capabilities = CODEC_CAP_DELAY, .flush = libschroedinger_flush, - .long_name = NULL_IF_CONFIG_SMALL("libschroedinger Dirac 2.2"), }; diff --git a/libavcodec/libschroedingerenc.c b/libavcodec/libschroedingerenc.c index 210dd342b5..e4789ee7c2 100644 --- a/libavcodec/libschroedingerenc.c +++ b/libavcodec/libschroedingerenc.c @@ -438,6 +438,7 @@ static int libschroedinger_encode_close(AVCodecContext *avctx) AVCodec ff_libschroedinger_encoder = { .name = "libschroedinger", + .long_name = NULL_IF_CONFIG_SMALL("libschroedinger Dirac 2.2"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_DIRAC, .priv_data_size = sizeof(SchroEncoderParams), @@ -448,5 +449,4 @@ AVCodec ff_libschroedinger_encoder = { .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("libschroedinger Dirac 2.2"), }; diff --git a/libavcodec/libspeexdec.c b/libavcodec/libspeexdec.c index a4bc16228b..d00696ee39 100644 --- a/libavcodec/libspeexdec.c +++ b/libavcodec/libspeexdec.c @@ -170,6 +170,7 @@ static av_cold void libspeex_decode_flush(AVCodecContext *avctx) AVCodec ff_libspeex_decoder = { .name = "libspeex", + .long_name = NULL_IF_CONFIG_SMALL("libspeex Speex"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_SPEEX, .priv_data_size = sizeof(LibSpeexContext), @@ -178,5 +179,4 @@ AVCodec ff_libspeex_decoder = { .decode = libspeex_decode_frame, .flush = libspeex_decode_flush, .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DELAY | CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("libspeex Speex"), }; diff --git a/libavcodec/libspeexenc.c b/libavcodec/libspeexenc.c index 9469a76288..651d7ace0b 100644 --- a/libavcodec/libspeexenc.c +++ b/libavcodec/libspeexenc.c @@ -350,6 +350,7 @@ static const AVCodecDefault defaults[] = { AVCodec ff_libspeex_encoder = { .name = "libspeex", + .long_name = NULL_IF_CONFIG_SMALL("libspeex Speex"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_SPEEX, .priv_data_size = sizeof(LibSpeexEncContext), @@ -363,7 +364,6 @@ AVCodec ff_libspeex_encoder = { AV_CH_LAYOUT_STEREO, 0 }, .supported_samplerates = (const int[]){ 8000, 16000, 32000, 0 }, - .long_name = NULL_IF_CONFIG_SMALL("libspeex Speex"), .priv_class = &class, .defaults = defaults, }; diff --git a/libavcodec/libtheoraenc.c b/libavcodec/libtheoraenc.c index 3990692145..b88566466e 100644 --- a/libavcodec/libtheoraenc.c +++ b/libavcodec/libtheoraenc.c @@ -365,6 +365,7 @@ static av_cold int encode_close(AVCodecContext* avc_context) /** AVCodec struct exposed to libavcodec */ AVCodec ff_libtheora_encoder = { .name = "libtheora", + .long_name = NULL_IF_CONFIG_SMALL("libtheora Theora"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_THEORA, .priv_data_size = sizeof(TheoraContext), @@ -375,5 +376,4 @@ AVCodec ff_libtheora_encoder = { .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("libtheora Theora"), }; diff --git a/libavcodec/libvo-aacenc.c b/libavcodec/libvo-aacenc.c index 3e5efb3466..9450792311 100644 --- a/libavcodec/libvo-aacenc.c +++ b/libavcodec/libvo-aacenc.c @@ -181,6 +181,7 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, AVCodec ff_libvo_aacenc_encoder = { .name = "libvo_aacenc", + .long_name = NULL_IF_CONFIG_SMALL("Android VisualOn AAC (Advanced Audio Coding)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_AAC, .priv_data_size = sizeof(AACContext), @@ -190,5 +191,4 @@ AVCodec ff_libvo_aacenc_encoder = { .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Android VisualOn AAC (Advanced Audio Coding)"), }; diff --git a/libavcodec/libvo-amrwbenc.c b/libavcodec/libvo-amrwbenc.c index af6ddf4ed8..b255ba5504 100644 --- a/libavcodec/libvo-amrwbenc.c +++ b/libavcodec/libvo-amrwbenc.c @@ -140,6 +140,8 @@ static int amr_wb_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, AVCodec ff_libvo_amrwbenc_encoder = { .name = "libvo_amrwbenc", + .long_name = NULL_IF_CONFIG_SMALL("Android VisualOn AMR-WB " + "(Adaptive Multi-Rate Wide-Band)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_AMR_WB, .priv_data_size = sizeof(AMRWBContext), @@ -148,7 +150,5 @@ AVCodec ff_libvo_amrwbenc_encoder = { .close = amr_wb_encode_close, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Android VisualOn AMR-WB " - "(Adaptive Multi-Rate Wide-Band)"), .priv_class = &class, }; diff --git a/libavcodec/libvorbis.c b/libavcodec/libvorbis.c index 8e02057a38..a635db39c7 100644 --- a/libavcodec/libvorbis.c +++ b/libavcodec/libvorbis.c @@ -337,6 +337,7 @@ static int oggvorbis_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, AVCodec ff_libvorbis_encoder = { .name = "libvorbis", + .long_name = NULL_IF_CONFIG_SMALL("libvorbis Vorbis"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_VORBIS, .priv_data_size = sizeof(OggVorbisContext), @@ -346,7 +347,6 @@ AVCodec ff_libvorbis_encoder = { .capabilities = CODEC_CAP_DELAY, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("libvorbis Vorbis"), .priv_class = &class, .defaults = defaults, }; diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c index 237b0f6a53..d19dd6fd12 100644 --- a/libavcodec/libvpxdec.c +++ b/libavcodec/libvpxdec.c @@ -118,6 +118,7 @@ static av_cold int vp8_init(AVCodecContext *avctx) AVCodec ff_libvpx_vp8_decoder = { .name = "libvpx", + .long_name = NULL_IF_CONFIG_SMALL("libvpx VP8"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_VP8, .priv_data_size = sizeof(VP8Context), @@ -125,7 +126,6 @@ AVCodec ff_libvpx_vp8_decoder = { .close = vp8_free, .decode = vp8_decode, .capabilities = CODEC_CAP_AUTO_THREADS | CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("libvpx VP8"), }; #endif /* CONFIG_LIBVPX_VP8_DECODER */ @@ -137,6 +137,7 @@ static av_cold int vp9_init(AVCodecContext *avctx) AVCodec ff_libvpx_vp9_decoder = { .name = "libvpx-vp9", + .long_name = NULL_IF_CONFIG_SMALL("libvpx VP9"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_VP9, .priv_data_size = sizeof(VP8Context), @@ -144,6 +145,5 @@ AVCodec ff_libvpx_vp9_decoder = { .close = vp8_free, .decode = vp8_decode, .capabilities = CODEC_CAP_AUTO_THREADS | CODEC_CAP_EXPERIMENTAL, - .long_name = NULL_IF_CONFIG_SMALL("libvpx VP9"), }; #endif /* CONFIG_LIBVPX_VP9_DECODER */ diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 0ecc2f913b..d5c4fe15ce 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -588,6 +588,7 @@ static const AVClass class_vp8 = { AVCodec ff_libvpx_vp8_encoder = { .name = "libvpx", + .long_name = NULL_IF_CONFIG_SMALL("libvpx VP8"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_VP8, .priv_data_size = sizeof(VP8Context), @@ -596,7 +597,6 @@ AVCodec ff_libvpx_vp8_encoder = { .close = vp8_free, .capabilities = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("libvpx VP8"), .priv_class = &class_vp8, .defaults = defaults, }; @@ -617,6 +617,7 @@ static const AVClass class_vp9 = { AVCodec ff_libvpx_vp9_encoder = { .name = "libvpx-vp9", + .long_name = NULL_IF_CONFIG_SMALL("libvpx VP9"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_VP9, .priv_data_size = sizeof(VP8Context), @@ -625,7 +626,6 @@ AVCodec ff_libvpx_vp9_encoder = { .close = vp8_free, .capabilities = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS | CODEC_CAP_EXPERIMENTAL, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("libvpx VP9"), .priv_class = &class_vp9, .defaults = defaults, }; diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index e967d31677..e842419150 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -603,6 +603,7 @@ static const AVCodecDefault x264_defaults[] = { AVCodec ff_libx264_encoder = { .name = "libx264", + .long_name = NULL_IF_CONFIG_SMALL("libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_H264, .priv_data_size = sizeof(X264Context), @@ -610,7 +611,6 @@ AVCodec ff_libx264_encoder = { .encode2 = X264_frame, .close = X264_close, .capabilities = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS, - .long_name = NULL_IF_CONFIG_SMALL("libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"), .priv_class = &class, .defaults = x264_defaults, .init_static_data = X264_init_static, diff --git a/libavcodec/libxavs.c b/libavcodec/libxavs.c index 16026ac86b..1fc08a9deb 100644 --- a/libavcodec/libxavs.c +++ b/libavcodec/libxavs.c @@ -420,6 +420,7 @@ static const AVCodecDefault xavs_defaults[] = { AVCodec ff_libxavs_encoder = { .name = "libxavs", + .long_name = NULL_IF_CONFIG_SMALL("libxavs Chinese AVS (Audio Video Standard)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_CAVS, .priv_data_size = sizeof(XavsContext), @@ -428,7 +429,6 @@ AVCodec ff_libxavs_encoder = { .close = XAVS_close, .capabilities = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("libxavs Chinese AVS (Audio Video Standard)"), .priv_class = &class, .defaults = xavs_defaults, }; diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c index dd1e3e3e8b..9a07207e3e 100644 --- a/libavcodec/libxvid.c +++ b/libavcodec/libxvid.c @@ -750,6 +750,7 @@ static av_cold int xvid_encode_close(AVCodecContext *avctx) { AVCodec ff_libxvid_encoder = { .name = "libxvid", + .long_name = NULL_IF_CONFIG_SMALL("libxvidcore MPEG-4 part 2"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MPEG4, .priv_data_size = sizeof(struct xvid_context), @@ -757,5 +758,4 @@ AVCodec ff_libxvid_encoder = { .encode2 = xvid_encode_frame, .close = xvid_encode_close, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("libxvidcore MPEG-4 part 2"), }; diff --git a/libavcodec/ljpegenc.c b/libavcodec/ljpegenc.c index c7291ada67..4b132399db 100644 --- a/libavcodec/ljpegenc.c +++ b/libavcodec/ljpegenc.c @@ -207,11 +207,11 @@ static int encode_picture_lossless(AVCodecContext *avctx, AVPacket *pkt, AVCodec ff_ljpeg_encoder = { //FIXME avoid MPV_* lossless JPEG should not need them .name = "ljpeg", + .long_name = NULL_IF_CONFIG_SMALL("Lossless JPEG"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_LJPEG, .priv_data_size = sizeof(MpegEncContext), .init = ff_MPV_encode_init, .encode2 = encode_picture_lossless, .close = ff_MPV_encode_end, - .long_name = NULL_IF_CONFIG_SMALL("Lossless JPEG"), }; diff --git a/libavcodec/loco.c b/libavcodec/loco.c index ec6fe2f944..6be081d8ad 100644 --- a/libavcodec/loco.c +++ b/libavcodec/loco.c @@ -317,11 +317,11 @@ static av_cold int decode_init(AVCodecContext *avctx) AVCodec ff_loco_decoder = { .name = "loco", + .long_name = NULL_IF_CONFIG_SMALL("LOCO"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_LOCO, .priv_data_size = sizeof(LOCOContext), .init = decode_init, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("LOCO"), }; diff --git a/libavcodec/mace.c b/libavcodec/mace.c index 76118e8f2f..25c6b703ac 100644 --- a/libavcodec/mace.c +++ b/libavcodec/mace.c @@ -281,26 +281,26 @@ static int mace_decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_mace3_decoder = { .name = "mace3", + .long_name = NULL_IF_CONFIG_SMALL("MACE (Macintosh Audio Compression/Expansion) 3:1"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_MACE3, .priv_data_size = sizeof(MACEContext), .init = mace_decode_init, .decode = mace_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("MACE (Macintosh Audio Compression/Expansion) 3:1"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_NONE }, }; AVCodec ff_mace6_decoder = { .name = "mace6", + .long_name = NULL_IF_CONFIG_SMALL("MACE (Macintosh Audio Compression/Expansion) 6:1"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_MACE6, .priv_data_size = sizeof(MACEContext), .init = mace_decode_init, .decode = mace_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("MACE (Macintosh Audio Compression/Expansion) 6:1"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_NONE }, }; diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c index 3a1a7074d4..b9ffca6a34 100644 --- a/libavcodec/mdec.c +++ b/libavcodec/mdec.c @@ -244,6 +244,7 @@ static av_cold int decode_end(AVCodecContext *avctx) AVCodec ff_mdec_decoder = { .name = "mdec", + .long_name = NULL_IF_CONFIG_SMALL("Sony PlayStation MDEC (Motion DECoder)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MDEC, .priv_data_size = sizeof(MDECContext), @@ -251,6 +252,5 @@ AVCodec ff_mdec_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, - .long_name = NULL_IF_CONFIG_SMALL("Sony PlayStation MDEC (Motion DECoder)"), .init_thread_copy = ONLY_IF_THREADS_ENABLED(decode_init_thread_copy) }; diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c index 84e33914cd..264c74afb4 100644 --- a/libavcodec/mimic.c +++ b/libavcodec/mimic.c @@ -467,6 +467,7 @@ static av_cold int mimic_init_thread_copy(AVCodecContext *avctx) AVCodec ff_mimic_decoder = { .name = "mimic", + .long_name = NULL_IF_CONFIG_SMALL("Mimic"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MIMIC, .priv_data_size = sizeof(MimicContext), @@ -474,7 +475,6 @@ AVCodec ff_mimic_decoder = { .close = mimic_decode_end, .decode = mimic_decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, - .long_name = NULL_IF_CONFIG_SMALL("Mimic"), .update_thread_context = ONLY_IF_THREADS_ENABLED(mimic_decode_update_thread_context), .init_thread_copy = ONLY_IF_THREADS_ENABLED(mimic_init_thread_copy), }; diff --git a/libavcodec/mjpegbdec.c b/libavcodec/mjpegbdec.c index 5edc0e4e24..a5f32a694a 100644 --- a/libavcodec/mjpegbdec.c +++ b/libavcodec/mjpegbdec.c @@ -150,6 +150,7 @@ read_header: AVCodec ff_mjpegb_decoder = { .name = "mjpegb", + .long_name = NULL_IF_CONFIG_SMALL("Apple MJPEG-B"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MJPEGB, .priv_data_size = sizeof(MJpegDecodeContext), @@ -157,5 +158,4 @@ AVCodec ff_mjpegb_decoder = { .close = ff_mjpeg_decode_end, .decode = mjpegb_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Apple MJPEG-B"), }; diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 65bf2645fb..fdf7c87675 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1684,6 +1684,7 @@ static const AVClass mjpegdec_class = { AVCodec ff_mjpeg_decoder = { .name = "mjpeg", + .long_name = NULL_IF_CONFIG_SMALL("MJPEG (Motion JPEG)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MJPEG, .priv_data_size = sizeof(MJpegDecodeContext), @@ -1691,12 +1692,12 @@ AVCodec ff_mjpeg_decoder = { .close = ff_mjpeg_decode_end, .decode = ff_mjpeg_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("MJPEG (Motion JPEG)"), .priv_class = &mjpegdec_class, }; AVCodec ff_thp_decoder = { .name = "thp", + .long_name = NULL_IF_CONFIG_SMALL("Nintendo Gamecube THP video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_THP, .priv_data_size = sizeof(MJpegDecodeContext), @@ -1704,5 +1705,4 @@ AVCodec ff_thp_decoder = { .close = ff_mjpeg_decode_end, .decode = ff_mjpeg_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Nintendo Gamecube THP video"), }; diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index 051cd12742..0bf3dc19da 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -444,6 +444,7 @@ void ff_mjpeg_encode_mb(MpegEncContext *s, int16_t block[6][64]) AVCodec ff_mjpeg_encoder = { .name = "mjpeg", + .long_name = NULL_IF_CONFIG_SMALL("MJPEG (Motion JPEG)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MJPEG, .priv_data_size = sizeof(MpegEncContext), @@ -453,5 +454,4 @@ AVCodec ff_mjpeg_encoder = { .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("MJPEG (Motion JPEG)"), }; diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 3224cfb17d..4339b9dbd5 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -1226,24 +1226,24 @@ error: AVCodec ff_mlp_decoder = { .name = "mlp", + .long_name = NULL_IF_CONFIG_SMALL("MLP (Meridian Lossless Packing)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_MLP, .priv_data_size = sizeof(MLPDecodeContext), .init = mlp_decode_init, .decode = read_access_unit, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("MLP (Meridian Lossless Packing)"), }; #if CONFIG_TRUEHD_DECODER AVCodec ff_truehd_decoder = { .name = "truehd", + .long_name = NULL_IF_CONFIG_SMALL("TrueHD"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_TRUEHD, .priv_data_size = sizeof(MLPDecodeContext), .init = mlp_decode_init, .decode = read_access_unit, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("TrueHD"), }; #endif /* CONFIG_TRUEHD_DECODER */ diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c index 48d5772114..1da104c670 100644 --- a/libavcodec/mmvideo.c +++ b/libavcodec/mmvideo.c @@ -229,6 +229,7 @@ static av_cold int mm_decode_end(AVCodecContext *avctx) AVCodec ff_mmvideo_decoder = { .name = "mmvideo", + .long_name = NULL_IF_CONFIG_SMALL("American Laser Games MM Video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MMVIDEO, .priv_data_size = sizeof(MmContext), @@ -236,5 +237,4 @@ AVCodec ff_mmvideo_decoder = { .close = mm_decode_end, .decode = mm_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("American Laser Games MM Video"), }; diff --git a/libavcodec/motionpixels.c b/libavcodec/motionpixels.c index 6ef9b0b351..6a7dd23db9 100644 --- a/libavcodec/motionpixels.c +++ b/libavcodec/motionpixels.c @@ -316,6 +316,7 @@ static av_cold int mp_decode_end(AVCodecContext *avctx) AVCodec ff_motionpixels_decoder = { .name = "motionpixels", + .long_name = NULL_IF_CONFIG_SMALL("Motion Pixels video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MOTIONPIXELS, .priv_data_size = sizeof(MotionPixelsContext), @@ -323,5 +324,4 @@ AVCodec ff_motionpixels_decoder = { .close = mp_decode_end, .decode = mp_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Motion Pixels video"), }; diff --git a/libavcodec/mpc7.c b/libavcodec/mpc7.c index 1aed52b8a0..a38b0ea595 100644 --- a/libavcodec/mpc7.c +++ b/libavcodec/mpc7.c @@ -329,6 +329,7 @@ static av_cold int mpc7_decode_close(AVCodecContext *avctx) AVCodec ff_mpc7_decoder = { .name = "mpc7", + .long_name = NULL_IF_CONFIG_SMALL("Musepack SV7"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_MUSEPACK7, .priv_data_size = sizeof(MPCContext), @@ -337,7 +338,6 @@ AVCodec ff_mpc7_decoder = { .decode = mpc7_decode_frame, .flush = mpc7_decode_flush, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Musepack SV7"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_NONE }, }; diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c index d14b8f14f1..b6e0cfdabb 100644 --- a/libavcodec/mpc8.c +++ b/libavcodec/mpc8.c @@ -429,6 +429,7 @@ static av_cold void mpc8_decode_flush(AVCodecContext *avctx) AVCodec ff_mpc8_decoder = { .name = "mpc8", + .long_name = NULL_IF_CONFIG_SMALL("Musepack SV8"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_MUSEPACK8, .priv_data_size = sizeof(MPCContext), @@ -436,7 +437,6 @@ AVCodec ff_mpc8_decoder = { .decode = mpc8_decode_frame, .flush = mpc8_decode_flush, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Musepack SV8"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_NONE }, }; diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index d9b49f3ab9..9d1696ce4b 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -2402,6 +2402,7 @@ static const AVProfile mpeg2_video_profiles[] = { AVCodec ff_mpeg1video_decoder = { .name = "mpeg1video", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MPEG1VIDEO, .priv_data_size = sizeof(Mpeg1Context), @@ -2412,12 +2413,12 @@ AVCodec ff_mpeg1video_decoder = { CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS, .flush = flush, - .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video"), .update_thread_context = ONLY_IF_THREADS_ENABLED(mpeg_decode_update_thread_context) }; AVCodec ff_mpeg2video_decoder = { .name = "mpeg2video", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MPEG2VIDEO, .priv_data_size = sizeof(Mpeg1Context), @@ -2428,7 +2429,6 @@ AVCodec ff_mpeg2video_decoder = { CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS, .flush = flush, - .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 video"), .profiles = NULL_IF_CONFIG_SMALL(mpeg2_video_profiles), }; @@ -2452,6 +2452,7 @@ static av_cold int mpeg_mc_decode_init(AVCodecContext *avctx) AVCodec ff_mpeg_xvmc_decoder = { .name = "mpegvideo_xvmc", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-1/2 video XvMC (X-Video Motion Compensation)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MPEG2VIDEO_XVMC, .priv_data_size = sizeof(Mpeg1Context), @@ -2461,7 +2462,6 @@ AVCodec ff_mpeg_xvmc_decoder = { .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED| CODEC_CAP_HWACCEL | CODEC_CAP_DELAY, .flush = flush, - .long_name = NULL_IF_CONFIG_SMALL("MPEG-1/2 video XvMC (X-Video Motion Compensation)"), }; #endif diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 2010d2af8e..41eefe2211 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -1022,6 +1022,7 @@ mpeg12_class(2) AVCodec ff_mpeg1video_encoder = { .name = "mpeg1video", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MPEG1VIDEO, .priv_data_size = sizeof(MpegEncContext), @@ -1032,12 +1033,12 @@ AVCodec ff_mpeg1video_encoder = { .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, .capabilities = CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS, - .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video"), .priv_class = &mpeg1_class, }; AVCodec ff_mpeg2video_encoder = { .name = "mpeg2video", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MPEG2VIDEO, .priv_data_size = sizeof(MpegEncContext), @@ -1049,6 +1050,5 @@ AVCodec ff_mpeg2video_encoder = { AV_PIX_FMT_YUV422P, AV_PIX_FMT_NONE }, .capabilities = CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS, - .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 video"), .priv_class = &mpeg2_class, }; diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 8760ab7b34..2b486ce516 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -2269,6 +2269,7 @@ static const AVProfile mpeg4_video_profiles[] = { AVCodec ff_mpeg4_decoder = { .name = "mpeg4", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MPEG4, .priv_data_size = sizeof(MpegEncContext), @@ -2279,7 +2280,6 @@ AVCodec ff_mpeg4_decoder = { CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY | CODEC_CAP_FRAME_THREADS, .flush = ff_mpeg_flush, - .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2"), .pix_fmts = ff_h263_hwaccel_pixfmt_list_420, .profiles = NULL_IF_CONFIG_SMALL(mpeg4_video_profiles), .update_thread_context = ONLY_IF_THREADS_ENABLED(ff_mpeg_update_thread_context), diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index fd39b3f8d7..e145bac770 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -1336,6 +1336,7 @@ static const AVClass mpeg4enc_class = { AVCodec ff_mpeg4_encoder = { .name = "mpeg4", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MPEG4, .priv_data_size = sizeof(MpegEncContext), @@ -1344,6 +1345,5 @@ AVCodec ff_mpeg4_encoder = { .close = ff_MPV_encode_end, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, .capabilities = CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS, - .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2"), .priv_class = &mpeg4enc_class, }; 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 }, }; diff --git a/libavcodec/mpegaudiodec_float.c b/libavcodec/mpegaudiodec_float.c index ac8df326be..b5c82231df 100644 --- a/libavcodec/mpegaudiodec_float.c +++ b/libavcodec/mpegaudiodec_float.c @@ -25,6 +25,7 @@ #if CONFIG_MP1FLOAT_DECODER AVCodec ff_mp1float_decoder = { .name = "mp1float", + .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), @@ -32,7 +33,6 @@ AVCodec ff_mp1float_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_FLTP, AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_NONE }, @@ -41,6 +41,7 @@ AVCodec ff_mp1float_decoder = { #if CONFIG_MP2FLOAT_DECODER AVCodec ff_mp2float_decoder = { .name = "mp2float", + .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), @@ -48,7 +49,6 @@ AVCodec ff_mp2float_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_FLTP, AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_NONE }, @@ -57,6 +57,7 @@ AVCodec ff_mp2float_decoder = { #if CONFIG_MP3FLOAT_DECODER AVCodec ff_mp3float_decoder = { .name = "mp3float", + .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), @@ -64,7 +65,6 @@ AVCodec ff_mp3float_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_FLTP, AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_NONE }, @@ -73,6 +73,7 @@ AVCodec ff_mp3float_decoder = { #if CONFIG_MP3ADUFLOAT_DECODER AVCodec ff_mp3adufloat_decoder = { .name = "mp3adufloat", + .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), @@ -80,7 +81,6 @@ AVCodec ff_mp3adufloat_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_FLTP, AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_NONE }, @@ -89,6 +89,7 @@ AVCodec ff_mp3adufloat_decoder = { #if CONFIG_MP3ON4FLOAT_DECODER AVCodec ff_mp3on4float_decoder = { .name = "mp3on4float", + .long_name = NULL_IF_CONFIG_SMALL("MP3onMP4"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_MP3ON4, .priv_data_size = sizeof(MP3On4DecodeContext), @@ -97,7 +98,6 @@ AVCodec ff_mp3on4float_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_FLTP, AV_SAMPLE_FMT_NONE }, }; diff --git a/libavcodec/mpegaudioenc.c b/libavcodec/mpegaudioenc.c index 76e7b88fce..739eb64f00 100644 --- a/libavcodec/mpegaudioenc.c +++ b/libavcodec/mpegaudioenc.c @@ -772,6 +772,7 @@ static const AVCodecDefault mp2_defaults[] = { AVCodec ff_mp2_encoder = { .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(MpegAudioContext), @@ -785,6 +786,5 @@ AVCodec ff_mp2_encoder = { .channel_layouts = (const uint64_t[]){ AV_CH_LAYOUT_MONO, AV_CH_LAYOUT_STEREO, 0 }, - .long_name = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"), .defaults = mp2_defaults, }; diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index d019f9c540..2bafedd338 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -4040,6 +4040,7 @@ static const AVClass h263_class = { AVCodec ff_h263_encoder = { .name = "h263", + .long_name = NULL_IF_CONFIG_SMALL("H.263 / H.263-1996"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_H263, .priv_data_size = sizeof(MpegEncContext), @@ -4047,7 +4048,6 @@ AVCodec ff_h263_encoder = { .encode2 = ff_MPV_encode_picture, .close = ff_MPV_encode_end, .pix_fmts= (const enum AVPixelFormat[]){AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE}, - .long_name= NULL_IF_CONFIG_SMALL("H.263 / H.263-1996"), .priv_class = &h263_class, }; @@ -4068,6 +4068,7 @@ static const AVClass h263p_class = { AVCodec ff_h263p_encoder = { .name = "h263p", + .long_name = NULL_IF_CONFIG_SMALL("H.263+ / H.263-1998 / H.263 version 2"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_H263P, .priv_data_size = sizeof(MpegEncContext), @@ -4076,7 +4077,6 @@ AVCodec ff_h263p_encoder = { .close = ff_MPV_encode_end, .capabilities = CODEC_CAP_SLICE_THREADS, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("H.263+ / H.263-1998 / H.263 version 2"), .priv_class = &h263p_class, }; @@ -4084,6 +4084,7 @@ FF_MPV_GENERIC_CLASS(msmpeg4v2) AVCodec ff_msmpeg4v2_encoder = { .name = "msmpeg4v2", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 2"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MSMPEG4V2, .priv_data_size = sizeof(MpegEncContext), @@ -4091,7 +4092,6 @@ AVCodec ff_msmpeg4v2_encoder = { .encode2 = ff_MPV_encode_picture, .close = ff_MPV_encode_end, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 2"), .priv_class = &msmpeg4v2_class, }; @@ -4099,6 +4099,7 @@ FF_MPV_GENERIC_CLASS(msmpeg4v3) AVCodec ff_msmpeg4v3_encoder = { .name = "msmpeg4", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 3"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MSMPEG4V3, .priv_data_size = sizeof(MpegEncContext), @@ -4106,7 +4107,6 @@ AVCodec ff_msmpeg4v3_encoder = { .encode2 = ff_MPV_encode_picture, .close = ff_MPV_encode_end, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 3"), .priv_class = &msmpeg4v3_class, }; @@ -4114,6 +4114,7 @@ FF_MPV_GENERIC_CLASS(wmv1) AVCodec ff_wmv1_encoder = { .name = "wmv1", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 7"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_WMV1, .priv_data_size = sizeof(MpegEncContext), @@ -4121,6 +4122,5 @@ AVCodec ff_wmv1_encoder = { .encode2 = ff_MPV_encode_picture, .close = ff_MPV_encode_end, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 7"), .priv_class = &wmv1_class, }; diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c index ebaf2e55e5..9a126332c7 100644 --- a/libavcodec/msmpeg4dec.c +++ b/libavcodec/msmpeg4dec.c @@ -902,6 +902,7 @@ int ff_msmpeg4_decode_motion(MpegEncContext * s, AVCodec ff_msmpeg4v1_decoder = { .name = "msmpeg4v1", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 1"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MSMPEG4V1, .priv_data_size = sizeof(MpegEncContext), @@ -909,12 +910,12 @@ AVCodec ff_msmpeg4v1_decoder = { .close = ff_h263_decode_end, .decode = ff_h263_decode_frame, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 1"), .pix_fmts = ff_pixfmt_list_420, }; AVCodec ff_msmpeg4v2_decoder = { .name = "msmpeg4v2", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 2"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MSMPEG4V2, .priv_data_size = sizeof(MpegEncContext), @@ -922,12 +923,12 @@ AVCodec ff_msmpeg4v2_decoder = { .close = ff_h263_decode_end, .decode = ff_h263_decode_frame, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 2"), .pix_fmts = ff_pixfmt_list_420, }; AVCodec ff_msmpeg4v3_decoder = { .name = "msmpeg4", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 3"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MSMPEG4V3, .priv_data_size = sizeof(MpegEncContext), @@ -935,12 +936,12 @@ AVCodec ff_msmpeg4v3_decoder = { .close = ff_h263_decode_end, .decode = ff_h263_decode_frame, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 3"), .pix_fmts = ff_pixfmt_list_420, }; AVCodec ff_wmv1_decoder = { .name = "wmv1", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 7"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_WMV1, .priv_data_size = sizeof(MpegEncContext), @@ -948,6 +949,5 @@ AVCodec ff_wmv1_decoder = { .close = ff_h263_decode_end, .decode = ff_h263_decode_frame, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 7"), .pix_fmts = ff_pixfmt_list_420, }; diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c index fe6819cc18..a57040f8dc 100644 --- a/libavcodec/msrle.c +++ b/libavcodec/msrle.c @@ -148,6 +148,7 @@ static av_cold int msrle_decode_end(AVCodecContext *avctx) AVCodec ff_msrle_decoder = { .name = "msrle", + .long_name = NULL_IF_CONFIG_SMALL("Microsoft RLE"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MSRLE, .priv_data_size = sizeof(MsrleContext), @@ -155,5 +156,4 @@ AVCodec ff_msrle_decoder = { .close = msrle_decode_end, .decode = msrle_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Microsoft RLE"), }; diff --git a/libavcodec/mss1.c b/libavcodec/mss1.c index dffdde5a15..b5e016b378 100644 --- a/libavcodec/mss1.c +++ b/libavcodec/mss1.c @@ -214,6 +214,7 @@ static av_cold int mss1_decode_end(AVCodecContext *avctx) AVCodec ff_mss1_decoder = { .name = "mss1", + .long_name = NULL_IF_CONFIG_SMALL("MS Screen 1"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MSS1, .priv_data_size = sizeof(MSS1Context), @@ -221,5 +222,4 @@ AVCodec ff_mss1_decoder = { .close = mss1_decode_end, .decode = mss1_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("MS Screen 1"), }; diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c index 2562209324..d9c04bea95 100644 --- a/libavcodec/mss2.c +++ b/libavcodec/mss2.c @@ -845,6 +845,7 @@ static av_cold int mss2_decode_init(AVCodecContext *avctx) AVCodec ff_mss2_decoder = { .name = "mss2", + .long_name = NULL_IF_CONFIG_SMALL("MS Windows Media Video V9 Screen"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MSS2, .priv_data_size = sizeof(MSS2Context), @@ -852,5 +853,4 @@ AVCodec ff_mss2_decoder = { .close = mss2_decode_end, .decode = mss2_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("MS Windows Media Video V9 Screen"), }; diff --git a/libavcodec/mss3.c b/libavcodec/mss3.c index fa5b99c454..020a43a15b 100644 --- a/libavcodec/mss3.c +++ b/libavcodec/mss3.c @@ -857,6 +857,7 @@ static av_cold int mss3_decode_end(AVCodecContext *avctx) AVCodec ff_msa1_decoder = { .name = "msa1", + .long_name = NULL_IF_CONFIG_SMALL("MS ATC Screen"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MSA1, .priv_data_size = sizeof(MSS3Context), @@ -864,5 +865,4 @@ AVCodec ff_msa1_decoder = { .close = mss3_decode_end, .decode = mss3_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("MS ATC Screen"), }; diff --git a/libavcodec/mss4.c b/libavcodec/mss4.c index a74c363dda..81de942f32 100644 --- a/libavcodec/mss4.c +++ b/libavcodec/mss4.c @@ -668,6 +668,7 @@ static av_cold int mss4_decode_end(AVCodecContext *avctx) AVCodec ff_mts2_decoder = { .name = "mts2", + .long_name = NULL_IF_CONFIG_SMALL("MS Expression Encoder Screen"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MTS2, .priv_data_size = sizeof(MSS4Context), @@ -675,5 +676,4 @@ AVCodec ff_mts2_decoder = { .close = mss4_decode_end, .decode = mss4_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("MS Expression Encoder Screen"), }; diff --git a/libavcodec/msvideo1.c b/libavcodec/msvideo1.c index fd968bce2c..b41151cdbd 100644 --- a/libavcodec/msvideo1.c +++ b/libavcodec/msvideo1.c @@ -337,6 +337,7 @@ static av_cold int msvideo1_decode_end(AVCodecContext *avctx) AVCodec ff_msvideo1_decoder = { .name = "msvideo1", + .long_name = NULL_IF_CONFIG_SMALL("Microsoft Video 1"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MSVIDEO1, .priv_data_size = sizeof(Msvideo1Context), @@ -344,5 +345,4 @@ AVCodec ff_msvideo1_decoder = { .close = msvideo1_decode_end, .decode = msvideo1_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Microsoft Video 1"), }; diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c index cfd0709f0a..3b9b77cc53 100644 --- a/libavcodec/nellymoserdec.c +++ b/libavcodec/nellymoserdec.c @@ -193,6 +193,7 @@ static av_cold int decode_end(AVCodecContext * avctx) { AVCodec ff_nellymoser_decoder = { .name = "nellymoser", + .long_name = NULL_IF_CONFIG_SMALL("Nellymoser Asao"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_NELLYMOSER, .priv_data_size = sizeof(NellyMoserDecodeContext), @@ -200,7 +201,6 @@ AVCodec ff_nellymoser_decoder = { .close = decode_end, .decode = decode_tag, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_PARAM_CHANGE, - .long_name = NULL_IF_CONFIG_SMALL("Nellymoser Asao"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_NONE }, }; diff --git a/libavcodec/nellymoserenc.c b/libavcodec/nellymoserenc.c index 98fef23627..fc803a2d56 100644 --- a/libavcodec/nellymoserenc.c +++ b/libavcodec/nellymoserenc.c @@ -406,6 +406,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *avpkt, AVCodec ff_nellymoser_encoder = { .name = "nellymoser", + .long_name = NULL_IF_CONFIG_SMALL("Nellymoser Asao"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_NELLYMOSER, .priv_data_size = sizeof(NellyMoserEncodeContext), @@ -413,7 +414,6 @@ AVCodec ff_nellymoser_encoder = { .encode2 = encode_frame, .close = encode_end, .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY, - .long_name = NULL_IF_CONFIG_SMALL("Nellymoser Asao"), .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_NONE }, }; diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c index 58a61e4fe2..0e0425403e 100644 --- a/libavcodec/nuv.c +++ b/libavcodec/nuv.c @@ -324,6 +324,7 @@ static av_cold int decode_end(AVCodecContext *avctx) AVCodec ff_nuv_decoder = { .name = "nuv", + .long_name = NULL_IF_CONFIG_SMALL("NuppelVideo/RTJPEG"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_NUV, .priv_data_size = sizeof(NuvContext), @@ -331,5 +332,4 @@ AVCodec ff_nuv_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("NuppelVideo/RTJPEG"), }; diff --git a/libavcodec/pamenc.c b/libavcodec/pamenc.c index dba47717e2..29c923ad0c 100644 --- a/libavcodec/pamenc.c +++ b/libavcodec/pamenc.c @@ -116,6 +116,7 @@ static int pam_encode_frame(AVCodecContext *avctx, AVPacket *pkt, AVCodec ff_pam_encoder = { .name = "pam", + .long_name = NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PAM, .priv_data_size = sizeof(PNMContext), @@ -125,5 +126,4 @@ AVCodec ff_pam_encoder = { AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB32, AV_PIX_FMT_GRAY8, AV_PIX_FMT_MONOWHITE, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"), }; diff --git a/libavcodec/pcm-bluray.c b/libavcodec/pcm-bluray.c index 79b137d6f9..7e4dcf83ed 100644 --- a/libavcodec/pcm-bluray.c +++ b/libavcodec/pcm-bluray.c @@ -304,6 +304,7 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_pcm_bluray_decoder = { .name = "pcm_bluray", + .long_name = NULL_IF_CONFIG_SMALL("PCM signed 16|20|24-bit big-endian for Blu-ray media"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_PCM_BLURAY, .decode = pcm_bluray_decode_frame, @@ -311,5 +312,4 @@ AVCodec ff_pcm_bluray_decoder = { .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("PCM signed 16|20|24-bit big-endian for Blu-ray media"), }; diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c index 26801fd561..882c167614 100644 --- a/libavcodec/pcm.c +++ b/libavcodec/pcm.c @@ -453,6 +453,7 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data, #define PCM_ENCODER_1(id_, sample_fmt_, name_, long_name_) \ AVCodec ff_ ## name_ ## _encoder = { \ .name = #name_, \ + .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ .type = AVMEDIA_TYPE_AUDIO, \ .id = AV_CODEC_ID_ ## id_, \ .init = pcm_encode_init, \ @@ -461,7 +462,6 @@ AVCodec ff_ ## name_ ## _encoder = { \ .capabilities = CODEC_CAP_VARIABLE_FRAME_SIZE, \ .sample_fmts = (const enum AVSampleFormat[]){ sample_fmt_, \ AV_SAMPLE_FMT_NONE }, \ - .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ } #define PCM_ENCODER_2(cf, id, sample_fmt, name, long_name) \ @@ -475,6 +475,7 @@ AVCodec ff_ ## name_ ## _encoder = { \ #define PCM_DECODER_1(id_, sample_fmt_, name_, long_name_) \ AVCodec ff_ ## name_ ## _decoder = { \ .name = #name_, \ + .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ .type = AVMEDIA_TYPE_AUDIO, \ .id = AV_CODEC_ID_ ## id_, \ .priv_data_size = sizeof(PCMDecode), \ @@ -483,7 +484,6 @@ AVCodec ff_ ## name_ ## _decoder = { \ .capabilities = CODEC_CAP_DR1, \ .sample_fmts = (const enum AVSampleFormat[]){ sample_fmt_, \ AV_SAMPLE_FMT_NONE }, \ - .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ } #define PCM_DECODER_2(cf, id, sample_fmt, name, long_name) \ diff --git a/libavcodec/pcx.c b/libavcodec/pcx.c index 05a8f7c3fb..ad92d756ce 100644 --- a/libavcodec/pcx.c +++ b/libavcodec/pcx.c @@ -241,9 +241,9 @@ end: AVCodec ff_pcx_decoder = { .name = "pcx", + .long_name = NULL_IF_CONFIG_SMALL("PC Paintbrush PCX image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PCX, .decode = pcx_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("PC Paintbrush PCX image"), }; diff --git a/libavcodec/pcxenc.c b/libavcodec/pcxenc.c index e0ee20ab74..4c08fba8bb 100644 --- a/libavcodec/pcxenc.c +++ b/libavcodec/pcxenc.c @@ -204,6 +204,7 @@ static int pcx_encode_frame(AVCodecContext *avctx, AVPacket *pkt, AVCodec ff_pcx_encoder = { .name = "pcx", + .long_name = NULL_IF_CONFIG_SMALL("PC Paintbrush PCX image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PCX, .priv_data_size = sizeof(PCXContext), @@ -216,5 +217,4 @@ AVCodec ff_pcx_encoder = { AV_PIX_FMT_MONOBLACK, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("PC Paintbrush PCX image"), }; diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c index f22088a747..874493ccbc 100644 --- a/libavcodec/pgssubdec.c +++ b/libavcodec/pgssubdec.c @@ -481,11 +481,11 @@ static int decode(AVCodecContext *avctx, void *data, int *data_size, AVCodec ff_pgssub_decoder = { .name = "pgssub", + .long_name = NULL_IF_CONFIG_SMALL("HDMV Presentation Graphic Stream subtitles"), .type = AVMEDIA_TYPE_SUBTITLE, .id = AV_CODEC_ID_HDMV_PGS_SUBTITLE, .priv_data_size = sizeof(PGSSubContext), .init = init_decoder, .close = close_decoder, .decode = decode, - .long_name = NULL_IF_CONFIG_SMALL("HDMV Presentation Graphic Stream subtitles"), }; diff --git a/libavcodec/pictordec.c b/libavcodec/pictordec.c index 020424ddae..2d72977897 100644 --- a/libavcodec/pictordec.c +++ b/libavcodec/pictordec.c @@ -244,10 +244,10 @@ finish: AVCodec ff_pictor_decoder = { .name = "pictor", + .long_name = NULL_IF_CONFIG_SMALL("Pictor/PC Paint"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PICTOR, .priv_data_size = sizeof(PicContext), .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Pictor/PC Paint"), }; diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 8864e4a214..e6462967f6 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -649,6 +649,7 @@ static av_cold int png_dec_end(AVCodecContext *avctx) AVCodec ff_png_decoder = { .name = "png", + .long_name = NULL_IF_CONFIG_SMALL("PNG (Portable Network Graphics) image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PNG, .priv_data_size = sizeof(PNGDecContext), @@ -656,5 +657,4 @@ AVCodec ff_png_decoder = { .close = png_dec_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1 /*| CODEC_CAP_DRAW_HORIZ_BAND*/, - .long_name = NULL_IF_CONFIG_SMALL("PNG (Portable Network Graphics) image"), }; diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c index 37910a15a3..f39fadd4c6 100644 --- a/libavcodec/pngenc.c +++ b/libavcodec/pngenc.c @@ -457,6 +457,7 @@ static av_cold int png_enc_init(AVCodecContext *avctx){ AVCodec ff_png_encoder = { .name = "png", + .long_name = NULL_IF_CONFIG_SMALL("PNG (Portable Network Graphics) image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PNG, .priv_data_size = sizeof(PNGEncContext), @@ -467,5 +468,4 @@ AVCodec ff_png_encoder = { AV_PIX_FMT_GRAY16BE, AV_PIX_FMT_MONOBLACK, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("PNG (Portable Network Graphics) image"), }; diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c index 38056fbbe1..9074d9b28c 100644 --- a/libavcodec/pnmdec.c +++ b/libavcodec/pnmdec.c @@ -230,59 +230,59 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data, #if CONFIG_PGM_DECODER AVCodec ff_pgm_decoder = { .name = "pgm", + .long_name = NULL_IF_CONFIG_SMALL("PGM (Portable GrayMap) image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PGM, .priv_data_size = sizeof(PNMContext), .decode = pnm_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("PGM (Portable GrayMap) image"), }; #endif #if CONFIG_PGMYUV_DECODER AVCodec ff_pgmyuv_decoder = { .name = "pgmyuv", + .long_name = NULL_IF_CONFIG_SMALL("PGMYUV (Portable GrayMap YUV) image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PGMYUV, .priv_data_size = sizeof(PNMContext), .decode = pnm_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("PGMYUV (Portable GrayMap YUV) image"), }; #endif #if CONFIG_PPM_DECODER AVCodec ff_ppm_decoder = { .name = "ppm", + .long_name = NULL_IF_CONFIG_SMALL("PPM (Portable PixelMap) image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PPM, .priv_data_size = sizeof(PNMContext), .decode = pnm_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("PPM (Portable PixelMap) image"), }; #endif #if CONFIG_PBM_DECODER AVCodec ff_pbm_decoder = { .name = "pbm", + .long_name = NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PBM, .priv_data_size = sizeof(PNMContext), .decode = pnm_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) image"), }; #endif #if CONFIG_PAM_DECODER AVCodec ff_pam_decoder = { .name = "pam", + .long_name = NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PAM, .priv_data_size = sizeof(PNMContext), .decode = pnm_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"), }; #endif diff --git a/libavcodec/pnmenc.c b/libavcodec/pnmenc.c index 7d8792f0ff..2e4983ce6c 100644 --- a/libavcodec/pnmenc.c +++ b/libavcodec/pnmenc.c @@ -128,6 +128,7 @@ static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt, #if CONFIG_PGM_ENCODER AVCodec ff_pgm_encoder = { .name = "pgm", + .long_name = NULL_IF_CONFIG_SMALL("PGM (Portable GrayMap) image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PGM, .priv_data_size = sizeof(PNMContext), @@ -136,13 +137,13 @@ AVCodec ff_pgm_encoder = { .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY16BE, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("PGM (Portable GrayMap) image"), }; #endif #if CONFIG_PGMYUV_ENCODER AVCodec ff_pgmyuv_encoder = { .name = "pgmyuv", + .long_name = NULL_IF_CONFIG_SMALL("PGMYUV (Portable GrayMap YUV) image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PGMYUV, .priv_data_size = sizeof(PNMContext), @@ -151,13 +152,13 @@ AVCodec ff_pgmyuv_encoder = { .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P16BE, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("PGMYUV (Portable GrayMap YUV) image"), }; #endif #if CONFIG_PPM_ENCODER AVCodec ff_ppm_encoder = { .name = "ppm", + .long_name = NULL_IF_CONFIG_SMALL("PPM (Portable PixelMap) image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PPM, .priv_data_size = sizeof(PNMContext), @@ -166,13 +167,13 @@ AVCodec ff_ppm_encoder = { .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB48BE, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("PPM (Portable PixelMap) image"), }; #endif #if CONFIG_PBM_ENCODER AVCodec ff_pbm_encoder = { .name = "pbm", + .long_name = NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PBM, .priv_data_size = sizeof(PNMContext), @@ -180,6 +181,5 @@ AVCodec ff_pbm_encoder = { .encode2 = pnm_encode_frame, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_MONOWHITE, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) image"), }; #endif diff --git a/libavcodec/proresdec.c b/libavcodec/proresdec.c index c3b480f18d..5687231a14 100644 --- a/libavcodec/proresdec.c +++ b/libavcodec/proresdec.c @@ -753,6 +753,7 @@ static av_cold int decode_close(AVCodecContext *avctx) AVCodec ff_prores_decoder = { .name = "prores", + .long_name = NULL_IF_CONFIG_SMALL("Apple ProRes (iCodec Pro)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PRORES, .priv_data_size = sizeof(ProresContext), @@ -760,5 +761,4 @@ AVCodec ff_prores_decoder = { .close = decode_close, .decode = decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_SLICE_THREADS, - .long_name = NULL_IF_CONFIG_SMALL("Apple ProRes (iCodec Pro)") }; diff --git a/libavcodec/proresenc.c b/libavcodec/proresenc.c index d989f8c228..758b8e3a54 100644 --- a/libavcodec/proresenc.c +++ b/libavcodec/proresenc.c @@ -1262,6 +1262,7 @@ static const AVClass proresenc_class = { AVCodec ff_prores_encoder = { .name = "prores", + .long_name = NULL_IF_CONFIG_SMALL("Apple ProRes (iCodec Pro)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PRORES, .priv_data_size = sizeof(ProresContext), @@ -1269,7 +1270,6 @@ AVCodec ff_prores_encoder = { .close = encode_close, .encode2 = encode_frame, .capabilities = CODEC_CAP_SLICE_THREADS, - .long_name = NULL_IF_CONFIG_SMALL("Apple ProRes (iCodec Pro)"), .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10, AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_NONE diff --git a/libavcodec/ptx.c b/libavcodec/ptx.c index 613c83179c..527e39acc6 100644 --- a/libavcodec/ptx.c +++ b/libavcodec/ptx.c @@ -93,9 +93,9 @@ static int ptx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVCodec ff_ptx_decoder = { .name = "ptx", + .long_name = NULL_IF_CONFIG_SMALL("V.Flash PTX image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PTX, .decode = ptx_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("V.Flash PTX image"), }; diff --git a/libavcodec/qcelpdec.c b/libavcodec/qcelpdec.c index 3772e26f91..7d9427c008 100644 --- a/libavcodec/qcelpdec.c +++ b/libavcodec/qcelpdec.c @@ -789,11 +789,11 @@ erasure: AVCodec ff_qcelp_decoder = { .name = "qcelp", + .long_name = NULL_IF_CONFIG_SMALL("QCELP / PureVoice"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_QCELP, .init = qcelp_decode_init, .decode = qcelp_decode_frame, .capabilities = CODEC_CAP_DR1, .priv_data_size = sizeof(QCELPContext), - .long_name = NULL_IF_CONFIG_SMALL("QCELP / PureVoice"), }; diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c index ece44b5c1c..04e7def067 100644 --- a/libavcodec/qdm2.c +++ b/libavcodec/qdm2.c @@ -2002,6 +2002,7 @@ static int qdm2_decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_qdm2_decoder = { .name = "qdm2", + .long_name = NULL_IF_CONFIG_SMALL("QDesign Music Codec 2"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_QDM2, .priv_data_size = sizeof(QDM2Context), @@ -2010,5 +2011,4 @@ AVCodec ff_qdm2_decoder = { .close = qdm2_decode_close, .decode = qdm2_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("QDesign Music Codec 2"), }; diff --git a/libavcodec/qdrw.c b/libavcodec/qdrw.c index 0dc72d0daa..c365bfd0df 100644 --- a/libavcodec/qdrw.c +++ b/libavcodec/qdrw.c @@ -144,10 +144,10 @@ static av_cold int decode_init(AVCodecContext *avctx) AVCodec ff_qdraw_decoder = { .name = "qdraw", + .long_name = NULL_IF_CONFIG_SMALL("Apple QuickDraw"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_QDRAW, .init = decode_init, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Apple QuickDraw"), }; diff --git a/libavcodec/qpeg.c b/libavcodec/qpeg.c index a3a5db5c10..38cf8295f2 100644 --- a/libavcodec/qpeg.c +++ b/libavcodec/qpeg.c @@ -316,6 +316,7 @@ static av_cold int decode_end(AVCodecContext *avctx){ AVCodec ff_qpeg_decoder = { .name = "qpeg", + .long_name = NULL_IF_CONFIG_SMALL("Q-team QPEG"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_QPEG, .priv_data_size = sizeof(QpegContext), @@ -323,5 +324,4 @@ AVCodec ff_qpeg_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Q-team QPEG"), }; diff --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c index b4667f43bb..f41569ad0a 100644 --- a/libavcodec/qtrle.c +++ b/libavcodec/qtrle.c @@ -504,6 +504,7 @@ static av_cold int qtrle_decode_end(AVCodecContext *avctx) AVCodec ff_qtrle_decoder = { .name = "qtrle", + .long_name = NULL_IF_CONFIG_SMALL("QuickTime Animation (RLE) video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_QTRLE, .priv_data_size = sizeof(QtrleContext), @@ -511,5 +512,4 @@ AVCodec ff_qtrle_decoder = { .close = qtrle_decode_end, .decode = qtrle_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("QuickTime Animation (RLE) video"), }; diff --git a/libavcodec/qtrleenc.c b/libavcodec/qtrleenc.c index bb686f571a..a4284594ed 100644 --- a/libavcodec/qtrleenc.c +++ b/libavcodec/qtrleenc.c @@ -329,6 +329,7 @@ static av_cold int qtrle_encode_end(AVCodecContext *avctx) AVCodec ff_qtrle_encoder = { .name = "qtrle", + .long_name = NULL_IF_CONFIG_SMALL("QuickTime Animation (RLE) video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_QTRLE, .priv_data_size = sizeof(QtrleEncContext), @@ -338,5 +339,4 @@ AVCodec ff_qtrle_encoder = { .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB555BE, AV_PIX_FMT_ARGB, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("QuickTime Animation (RLE) video"), }; diff --git a/libavcodec/r210dec.c b/libavcodec/r210dec.c index 35150d8602..6adaac0d35 100644 --- a/libavcodec/r210dec.c +++ b/libavcodec/r210dec.c @@ -84,22 +84,22 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, #if CONFIG_R210_DECODER AVCodec ff_r210_decoder = { .name = "r210", + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed RGB 10-bit"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_R210, .init = decode_init, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed RGB 10-bit"), }; #endif #if CONFIG_R10K_DECODER AVCodec ff_r10k_decoder = { .name = "r10k", + .long_name = NULL_IF_CONFIG_SMALL("AJA Kona 10-bit RGB Codec"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_R10K, .init = decode_init, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("AJA Kona 10-bit RGB Codec"), }; #endif diff --git a/libavcodec/ra144dec.c b/libavcodec/ra144dec.c index 15162c30b2..3be3877f31 100644 --- a/libavcodec/ra144dec.c +++ b/libavcodec/ra144dec.c @@ -129,11 +129,11 @@ static int ra144_decode_frame(AVCodecContext * avctx, void *data, AVCodec ff_ra_144_decoder = { .name = "real_144", + .long_name = NULL_IF_CONFIG_SMALL("RealAudio 1.0 (14.4K)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_RA_144, .priv_data_size = sizeof(RA144Context), .init = ra144_decode_init, .decode = ra144_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("RealAudio 1.0 (14.4K)"), }; diff --git a/libavcodec/ra144enc.c b/libavcodec/ra144enc.c index c05c2435d7..9f953d4f01 100644 --- a/libavcodec/ra144enc.c +++ b/libavcodec/ra144enc.c @@ -545,6 +545,7 @@ static int ra144_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, AVCodec ff_ra_144_encoder = { .name = "real_144", + .long_name = NULL_IF_CONFIG_SMALL("RealAudio 1.0 (14.4K)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_RA_144, .priv_data_size = sizeof(RA144Context), @@ -554,5 +555,4 @@ AVCodec ff_ra_144_encoder = { .capabilities = CODEC_CAP_DELAY | CODEC_CAP_SMALL_LAST_FRAME, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("RealAudio 1.0 (14.4K)"), }; diff --git a/libavcodec/ra288.c b/libavcodec/ra288.c index 0b750ac2b6..215786c803 100644 --- a/libavcodec/ra288.c +++ b/libavcodec/ra288.c @@ -224,11 +224,11 @@ static int ra288_decode_frame(AVCodecContext * avctx, void *data, AVCodec ff_ra_288_decoder = { .name = "real_288", + .long_name = NULL_IF_CONFIG_SMALL("RealAudio 2.0 (28.8K)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_RA_288, .priv_data_size = sizeof(RA288Context), .init = ra288_decode_init, .decode = ra288_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("RealAudio 2.0 (28.8K)"), }; diff --git a/libavcodec/ralf.c b/libavcodec/ralf.c index e78a9d442d..ebcdf6fbe3 100644 --- a/libavcodec/ralf.c +++ b/libavcodec/ralf.c @@ -524,6 +524,7 @@ static void decode_flush(AVCodecContext *avctx) AVCodec ff_ralf_decoder = { .name = "ralf", + .long_name = NULL_IF_CONFIG_SMALL("RealAudio Lossless"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_RALF, .priv_data_size = sizeof(RALFContext), @@ -532,7 +533,6 @@ AVCodec ff_ralf_decoder = { .decode = decode_frame, .flush = decode_flush, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("RealAudio Lossless"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_NONE }, }; diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index 66265ced50..24d06f3087 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -254,11 +254,11 @@ static av_cold int raw_close_decoder(AVCodecContext *avctx) AVCodec ff_rawvideo_decoder = { .name = "rawvideo", + .long_name = NULL_IF_CONFIG_SMALL("raw video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_RAWVIDEO, .priv_data_size = sizeof(RawVideoContext), .init = raw_init_decoder, .close = raw_close_decoder, .decode = raw_decode, - .long_name = NULL_IF_CONFIG_SMALL("raw video"), }; diff --git a/libavcodec/rawenc.c b/libavcodec/rawenc.c index 3e607afda6..6c90d33776 100644 --- a/libavcodec/rawenc.c +++ b/libavcodec/rawenc.c @@ -71,10 +71,10 @@ static int raw_encode(AVCodecContext *avctx, AVPacket *pkt, AVCodec ff_rawvideo_encoder = { .name = "rawvideo", + .long_name = NULL_IF_CONFIG_SMALL("raw video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_RAWVIDEO, .priv_data_size = sizeof(AVFrame), .init = raw_init_encoder, .encode2 = raw_encode, - .long_name = NULL_IF_CONFIG_SMALL("raw video"), }; diff --git a/libavcodec/rl2.c b/libavcodec/rl2.c index 4f68f7e997..54b3e6a010 100644 --- a/libavcodec/rl2.c +++ b/libavcodec/rl2.c @@ -217,6 +217,7 @@ static av_cold int rl2_decode_end(AVCodecContext *avctx) AVCodec ff_rl2_decoder = { .name = "rl2", + .long_name = NULL_IF_CONFIG_SMALL("RL2 video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_RL2, .priv_data_size = sizeof(Rl2Context), @@ -224,5 +225,4 @@ AVCodec ff_rl2_decoder = { .close = rl2_decode_end, .decode = rl2_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("RL2 video"), }; diff --git a/libavcodec/roqaudioenc.c b/libavcodec/roqaudioenc.c index d440fbe944..f97d5d6e0c 100644 --- a/libavcodec/roqaudioenc.c +++ b/libavcodec/roqaudioenc.c @@ -193,6 +193,7 @@ static int roq_dpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, AVCodec ff_roq_dpcm_encoder = { .name = "roq_dpcm", + .long_name = NULL_IF_CONFIG_SMALL("id RoQ DPCM"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_ROQ_DPCM, .priv_data_size = sizeof(ROQDPCMContext), @@ -202,5 +203,4 @@ AVCodec ff_roq_dpcm_encoder = { .capabilities = CODEC_CAP_DELAY, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("id RoQ DPCM"), }; diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c index 39233be87c..ac7d4bafe0 100644 --- a/libavcodec/roqvideodec.c +++ b/libavcodec/roqvideodec.c @@ -227,6 +227,7 @@ static av_cold int roq_decode_end(AVCodecContext *avctx) AVCodec ff_roq_decoder = { .name = "roqvideo", + .long_name = NULL_IF_CONFIG_SMALL("id RoQ video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_ROQ, .priv_data_size = sizeof(RoqContext), @@ -234,5 +235,4 @@ AVCodec ff_roq_decoder = { .close = roq_decode_end, .decode = roq_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("id RoQ video"), }; diff --git a/libavcodec/roqvideoenc.c b/libavcodec/roqvideoenc.c index 650db6767e..af0089fb7f 100644 --- a/libavcodec/roqvideoenc.c +++ b/libavcodec/roqvideoenc.c @@ -1079,6 +1079,7 @@ static int roq_encode_frame(AVCodecContext *avctx, AVPacket *pkt, AVCodec ff_roq_encoder = { .name = "roqvideo", + .long_name = NULL_IF_CONFIG_SMALL("id RoQ video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_ROQ, .priv_data_size = sizeof(RoqContext), @@ -1088,5 +1089,4 @@ AVCodec ff_roq_encoder = { .supported_framerates = (const AVRational[]){ {30,1}, {0,0} }, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV444P, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("id RoQ video"), }; diff --git a/libavcodec/rpza.c b/libavcodec/rpza.c index ca9f7ea336..d209f58d9a 100644 --- a/libavcodec/rpza.c +++ b/libavcodec/rpza.c @@ -283,6 +283,7 @@ static av_cold int rpza_decode_end(AVCodecContext *avctx) AVCodec ff_rpza_decoder = { .name = "rpza", + .long_name = NULL_IF_CONFIG_SMALL("QuickTime video (RPZA)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_RPZA, .priv_data_size = sizeof(RpzaContext), @@ -290,5 +291,4 @@ AVCodec ff_rpza_decoder = { .close = rpza_decode_end, .decode = rpza_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("QuickTime video (RPZA)"), }; diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index 2c76bb2585..f790c1fa9e 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -735,6 +735,7 @@ static int rv10_decode_frame(AVCodecContext *avctx, AVCodec ff_rv10_decoder = { .name = "rv10", + .long_name = NULL_IF_CONFIG_SMALL("RealVideo 1.0"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_RV10, .priv_data_size = sizeof(RVDecContext), @@ -742,12 +743,12 @@ AVCodec ff_rv10_decoder = { .close = rv10_decode_end, .decode = rv10_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("RealVideo 1.0"), .pix_fmts = ff_pixfmt_list_420, }; AVCodec ff_rv20_decoder = { .name = "rv20", + .long_name = NULL_IF_CONFIG_SMALL("RealVideo 2.0"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_RV20, .priv_data_size = sizeof(RVDecContext), @@ -756,6 +757,5 @@ AVCodec ff_rv20_decoder = { .decode = rv10_decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY, .flush = ff_mpeg_flush, - .long_name = NULL_IF_CONFIG_SMALL("RealVideo 2.0"), .pix_fmts = ff_pixfmt_list_420, }; diff --git a/libavcodec/rv10enc.c b/libavcodec/rv10enc.c index d3cd12c3f8..9b23d7d92a 100644 --- a/libavcodec/rv10enc.c +++ b/libavcodec/rv10enc.c @@ -60,6 +60,7 @@ FF_MPV_GENERIC_CLASS(rv10) AVCodec ff_rv10_encoder = { .name = "rv10", + .long_name = NULL_IF_CONFIG_SMALL("RealVideo 1.0"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_RV10, .priv_data_size = sizeof(MpegEncContext), @@ -67,6 +68,5 @@ AVCodec ff_rv10_encoder = { .encode2 = ff_MPV_encode_picture, .close = ff_MPV_encode_end, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("RealVideo 1.0"), .priv_class = &rv10_class, }; diff --git a/libavcodec/rv20enc.c b/libavcodec/rv20enc.c index c392b53cd6..67879e2e98 100644 --- a/libavcodec/rv20enc.c +++ b/libavcodec/rv20enc.c @@ -61,6 +61,7 @@ FF_MPV_GENERIC_CLASS(rv20) AVCodec ff_rv20_encoder = { .name = "rv20", + .long_name = NULL_IF_CONFIG_SMALL("RealVideo 2.0"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_RV20, .priv_data_size = sizeof(MpegEncContext), @@ -68,6 +69,5 @@ AVCodec ff_rv20_encoder = { .encode2 = ff_MPV_encode_picture, .close = ff_MPV_encode_end, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("RealVideo 2.0"), .priv_class = &rv20_class, }; diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c index 265ede336b..ffb433b173 100644 --- a/libavcodec/rv30.c +++ b/libavcodec/rv30.c @@ -270,6 +270,7 @@ static av_cold int rv30_decode_init(AVCodecContext *avctx) AVCodec ff_rv30_decoder = { .name = "rv30", + .long_name = NULL_IF_CONFIG_SMALL("RealVideo 3.0"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_RV30, .priv_data_size = sizeof(RV34DecContext), @@ -279,7 +280,6 @@ AVCodec ff_rv30_decoder = { .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_FRAME_THREADS, .flush = ff_mpeg_flush, - .long_name = NULL_IF_CONFIG_SMALL("RealVideo 3.0"), .pix_fmts = ff_pixfmt_list_420, .init_thread_copy = ONLY_IF_THREADS_ENABLED(ff_rv34_decode_init_thread_copy), .update_thread_context = ONLY_IF_THREADS_ENABLED(ff_rv34_decode_update_thread_context), diff --git a/libavcodec/rv40.c b/libavcodec/rv40.c index d43d16b928..def3990348 100644 --- a/libavcodec/rv40.c +++ b/libavcodec/rv40.c @@ -562,6 +562,7 @@ static av_cold int rv40_decode_init(AVCodecContext *avctx) AVCodec ff_rv40_decoder = { .name = "rv40", + .long_name = NULL_IF_CONFIG_SMALL("RealVideo 4.0"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_RV40, .priv_data_size = sizeof(RV34DecContext), @@ -571,7 +572,6 @@ AVCodec ff_rv40_decoder = { .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_FRAME_THREADS, .flush = ff_mpeg_flush, - .long_name = NULL_IF_CONFIG_SMALL("RealVideo 4.0"), .pix_fmts = ff_pixfmt_list_420, .init_thread_copy = ONLY_IF_THREADS_ENABLED(ff_rv34_decode_init_thread_copy), .update_thread_context = ONLY_IF_THREADS_ENABLED(ff_rv34_decode_update_thread_context), diff --git a/libavcodec/s302m.c b/libavcodec/s302m.c index 66d25f11b4..36384fb29a 100644 --- a/libavcodec/s302m.c +++ b/libavcodec/s302m.c @@ -142,9 +142,9 @@ static int s302m_decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_s302m_decoder = { .name = "s302m", + .long_name = NULL_IF_CONFIG_SMALL("SMPTE 302M"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_S302M, .decode = s302m_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("SMPTE 302M"), }; diff --git a/libavcodec/sgidec.c b/libavcodec/sgidec.c index a4b31288f2..476311d03a 100644 --- a/libavcodec/sgidec.c +++ b/libavcodec/sgidec.c @@ -235,10 +235,10 @@ static int decode_frame(AVCodecContext *avctx, AVCodec ff_sgi_decoder = { .name = "sgi", + .long_name = NULL_IF_CONFIG_SMALL("SGI image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_SGI, .priv_data_size = sizeof(SgiState), .decode = decode_frame, - .long_name = NULL_IF_CONFIG_SMALL("SGI image"), .capabilities = CODEC_CAP_DR1, }; diff --git a/libavcodec/sgienc.c b/libavcodec/sgienc.c index 2aecc59872..6a595c75fb 100644 --- a/libavcodec/sgienc.c +++ b/libavcodec/sgienc.c @@ -172,6 +172,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, AVCodec ff_sgi_encoder = { .name = "sgi", + .long_name = NULL_IF_CONFIG_SMALL("SGI image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_SGI, .priv_data_size = sizeof(SgiContext), @@ -180,5 +181,4 @@ AVCodec ff_sgi_encoder = { .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("SGI image"), }; diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index c394c52a26..6a2f56e3c3 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -650,6 +650,7 @@ static av_cold int shorten_decode_close(AVCodecContext *avctx) AVCodec ff_shorten_decoder = { .name = "shorten", + .long_name = NULL_IF_CONFIG_SMALL("Shorten"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_SHORTEN, .priv_data_size = sizeof(ShortenContext), @@ -657,7 +658,6 @@ AVCodec ff_shorten_decoder = { .close = shorten_decode_close, .decode = shorten_decode_frame, .capabilities = CODEC_CAP_DELAY | CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Shorten"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_NONE }, }; diff --git a/libavcodec/sipr.c b/libavcodec/sipr.c index 83a4217c6f..98607f2287 100644 --- a/libavcodec/sipr.c +++ b/libavcodec/sipr.c @@ -566,11 +566,11 @@ static int sipr_decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_sipr_decoder = { .name = "sipr", + .long_name = NULL_IF_CONFIG_SMALL("RealAudio SIPR / ACELP.NET"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_SIPR, .priv_data_size = sizeof(SiprContext), .init = sipr_decoder_init, .decode = sipr_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("RealAudio SIPR / ACELP.NET"), }; diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index c8850d3368..ffd816f721 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -753,6 +753,7 @@ error: AVCodec ff_smacker_decoder = { .name = "smackvid", + .long_name = NULL_IF_CONFIG_SMALL("Smacker video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_SMACKVIDEO, .priv_data_size = sizeof(SmackVContext), @@ -760,15 +761,14 @@ AVCodec ff_smacker_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Smacker video"), }; AVCodec ff_smackaud_decoder = { .name = "smackaud", + .long_name = NULL_IF_CONFIG_SMALL("Smacker audio"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_SMACKAUDIO, .init = smka_decode_init, .decode = smka_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Smacker audio"), }; diff --git a/libavcodec/smc.c b/libavcodec/smc.c index 2fcf61fa2d..d28597b733 100644 --- a/libavcodec/smc.c +++ b/libavcodec/smc.c @@ -465,6 +465,7 @@ static av_cold int smc_decode_end(AVCodecContext *avctx) AVCodec ff_smc_decoder = { .name = "smc", + .long_name = NULL_IF_CONFIG_SMALL("QuickTime Graphics (SMC)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_SMC, .priv_data_size = sizeof(SmcContext), @@ -472,5 +473,4 @@ AVCodec ff_smc_decoder = { .close = smc_decode_end, .decode = smc_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("QuickTime Graphics (SMC)"), }; diff --git a/libavcodec/sp5xdec.c b/libavcodec/sp5xdec.c index 90c34911bd..ca6b9fd6f0 100644 --- a/libavcodec/sp5xdec.c +++ b/libavcodec/sp5xdec.c @@ -95,6 +95,7 @@ static int sp5x_decode_frame(AVCodecContext *avctx, AVCodec ff_sp5x_decoder = { .name = "sp5x", + .long_name = NULL_IF_CONFIG_SMALL("Sunplus JPEG (SP5X)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_SP5X, .priv_data_size = sizeof(MJpegDecodeContext), @@ -102,16 +103,15 @@ AVCodec ff_sp5x_decoder = { .close = ff_mjpeg_decode_end, .decode = sp5x_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Sunplus JPEG (SP5X)"), }; AVCodec ff_amv_decoder = { .name = "amv", + .long_name = NULL_IF_CONFIG_SMALL("AMV Video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_AMV, .priv_data_size = sizeof(MJpegDecodeContext), .init = ff_mjpeg_decode_init, .close = ff_mjpeg_decode_end, .decode = sp5x_decode_frame, - .long_name = NULL_IF_CONFIG_SMALL("AMV Video"), }; diff --git a/libavcodec/sunrast.c b/libavcodec/sunrast.c index 281913fd58..4147cf0b82 100644 --- a/libavcodec/sunrast.c +++ b/libavcodec/sunrast.c @@ -170,9 +170,9 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_sunrast_decoder = { .name = "sunrast", + .long_name = NULL_IF_CONFIG_SMALL("Sun Rasterfile image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_SUNRAST, .decode = sunrast_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Sun Rasterfile image"), }; diff --git a/libavcodec/sunrastenc.c b/libavcodec/sunrastenc.c index e1b52112d4..58d0fb8d31 100644 --- a/libavcodec/sunrastenc.c +++ b/libavcodec/sunrastenc.c @@ -214,6 +214,7 @@ static const AVCodecDefault sunrast_defaults[] = { AVCodec ff_sunrast_encoder = { .name = "sunrast", + .long_name = NULL_IF_CONFIG_SMALL("Sun Rasterfile image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_SUNRAST, .priv_data_size = sizeof(SUNRASTContext), @@ -225,5 +226,4 @@ AVCodec ff_sunrast_encoder = { AV_PIX_FMT_GRAY8, AV_PIX_FMT_MONOWHITE, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Sun Rasterfile image"), }; diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c index 59233a061d..7d3ef50db8 100644 --- a/libavcodec/svq1dec.c +++ b/libavcodec/svq1dec.c @@ -806,6 +806,7 @@ static void svq1_flush(AVCodecContext *avctx) AVCodec ff_svq1_decoder = { .name = "svq1", + .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 1 / Sorenson Video 1 / SVQ1"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_SVQ1, .priv_data_size = sizeof(SVQ1Context), @@ -816,5 +817,4 @@ AVCodec ff_svq1_decoder = { .flush = svq1_flush, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV410P, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 1 / Sorenson Video 1 / SVQ1"), }; diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c index 70d1ee5c88..fa94f52abb 100644 --- a/libavcodec/svq1enc.c +++ b/libavcodec/svq1enc.c @@ -625,6 +625,7 @@ static av_cold int svq1_encode_end(AVCodecContext *avctx) AVCodec ff_svq1_encoder = { .name = "svq1", + .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 1 / Sorenson Video 1 / SVQ1"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_SVQ1, .priv_data_size = sizeof(SVQ1Context), @@ -633,5 +634,4 @@ AVCodec ff_svq1_encoder = { .close = svq1_encode_end, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV410P, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 1 / Sorenson Video 1 / SVQ1"), }; diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index a345788fb5..775e07100c 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -1311,6 +1311,7 @@ static av_cold int svq3_decode_end(AVCodecContext *avctx) AVCodec ff_svq3_decoder = { .name = "svq3", + .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 3 / Sorenson Video 3 / SVQ3"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_SVQ3, .priv_data_size = sizeof(SVQ3Context), @@ -1320,7 +1321,6 @@ AVCodec ff_svq3_decoder = { .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_DELAY, - .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 3 / Sorenson Video 3 / SVQ3"), .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_NONE}, }; diff --git a/libavcodec/takdec.c b/libavcodec/takdec.c index 4047513e0f..8b3966112c 100644 --- a/libavcodec/takdec.c +++ b/libavcodec/takdec.c @@ -915,6 +915,7 @@ static av_cold int tak_decode_close(AVCodecContext *avctx) AVCodec ff_tak_decoder = { .name = "tak", + .long_name = NULL_IF_CONFIG_SMALL("TAK (Tom's lossless Audio Kompressor)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_TAK, .priv_data_size = sizeof(TAKDecContext), @@ -923,7 +924,6 @@ AVCodec ff_tak_decoder = { .close = tak_decode_close, .decode = tak_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("TAK (Tom's lossless Audio Kompressor)"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_U8P, AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_S32P, diff --git a/libavcodec/targa.c b/libavcodec/targa.c index 993f02c011..9f0b286813 100644 --- a/libavcodec/targa.c +++ b/libavcodec/targa.c @@ -234,10 +234,10 @@ static int decode_frame(AVCodecContext *avctx, AVCodec ff_targa_decoder = { .name = "targa", + .long_name = NULL_IF_CONFIG_SMALL("Truevision Targa image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_TARGA, .priv_data_size = sizeof(TargaContext), .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Truevision Targa image"), }; diff --git a/libavcodec/targaenc.c b/libavcodec/targaenc.c index e13545f82b..610621fcc3 100644 --- a/libavcodec/targaenc.c +++ b/libavcodec/targaenc.c @@ -166,6 +166,7 @@ static av_cold int targa_encode_init(AVCodecContext *avctx) AVCodec ff_targa_encoder = { .name = "targa", + .long_name = NULL_IF_CONFIG_SMALL("Truevision Targa image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_TARGA, .priv_data_size = sizeof(TargaContext), @@ -175,5 +176,4 @@ AVCodec ff_targa_encoder = { AV_PIX_FMT_BGR24, AV_PIX_FMT_BGRA, AV_PIX_FMT_RGB555LE, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE }, - .long_name= NULL_IF_CONFIG_SMALL("Truevision Targa image"), }; diff --git a/libavcodec/tiertexseqv.c b/libavcodec/tiertexseqv.c index 50f8921dde..fe963eff41 100644 --- a/libavcodec/tiertexseqv.c +++ b/libavcodec/tiertexseqv.c @@ -258,6 +258,7 @@ static av_cold int seqvideo_decode_end(AVCodecContext *avctx) AVCodec ff_tiertexseqvideo_decoder = { .name = "tiertexseqvideo", + .long_name = NULL_IF_CONFIG_SMALL("Tiertex Limited SEQ video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_TIERTEXSEQVIDEO, .priv_data_size = sizeof(SeqVideoContext), @@ -265,5 +266,4 @@ AVCodec ff_tiertexseqvideo_decoder = { .close = seqvideo_decode_end, .decode = seqvideo_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Tiertex Limited SEQ video"), }; diff --git a/libavcodec/tmv.c b/libavcodec/tmv.c index c1e4d253ec..f04a5f5fa1 100644 --- a/libavcodec/tmv.c +++ b/libavcodec/tmv.c @@ -88,10 +88,10 @@ static av_cold int tmv_decode_init(AVCodecContext *avctx) AVCodec ff_tmv_decoder = { .name = "tmv", + .long_name = NULL_IF_CONFIG_SMALL("8088flex TMV"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_TMV, .init = tmv_decode_init, .decode = tmv_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("8088flex TMV"), }; diff --git a/libavcodec/truemotion1.c b/libavcodec/truemotion1.c index 9c219172b8..c1e086366e 100644 --- a/libavcodec/truemotion1.c +++ b/libavcodec/truemotion1.c @@ -884,6 +884,7 @@ static av_cold int truemotion1_decode_end(AVCodecContext *avctx) AVCodec ff_truemotion1_decoder = { .name = "truemotion1", + .long_name = NULL_IF_CONFIG_SMALL("Duck TrueMotion 1.0"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_TRUEMOTION1, .priv_data_size = sizeof(TrueMotion1Context), @@ -891,5 +892,4 @@ AVCodec ff_truemotion1_decoder = { .close = truemotion1_decode_end, .decode = truemotion1_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Duck TrueMotion 1.0"), }; diff --git a/libavcodec/truemotion2.c b/libavcodec/truemotion2.c index 4d23f56565..5d9408d166 100644 --- a/libavcodec/truemotion2.c +++ b/libavcodec/truemotion2.c @@ -975,6 +975,7 @@ static av_cold int decode_end(AVCodecContext *avctx) AVCodec ff_truemotion2_decoder = { .name = "truemotion2", + .long_name = NULL_IF_CONFIG_SMALL("Duck TrueMotion 2.0"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_TRUEMOTION2, .priv_data_size = sizeof(TM2Context), @@ -982,5 +983,4 @@ AVCodec ff_truemotion2_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Duck TrueMotion 2.0"), }; diff --git a/libavcodec/truespeech.c b/libavcodec/truespeech.c index ff39343d0e..3f56973e0e 100644 --- a/libavcodec/truespeech.c +++ b/libavcodec/truespeech.c @@ -358,11 +358,11 @@ static int truespeech_decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_truespeech_decoder = { .name = "truespeech", + .long_name = NULL_IF_CONFIG_SMALL("DSP Group TrueSpeech"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_TRUESPEECH, .priv_data_size = sizeof(TSContext), .init = truespeech_decode_init, .decode = truespeech_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("DSP Group TrueSpeech"), }; diff --git a/libavcodec/tscc.c b/libavcodec/tscc.c index ce88b0e754..c26853e6a5 100644 --- a/libavcodec/tscc.c +++ b/libavcodec/tscc.c @@ -175,6 +175,7 @@ static av_cold int decode_end(AVCodecContext *avctx) AVCodec ff_tscc_decoder = { .name = "camtasia", + .long_name = NULL_IF_CONFIG_SMALL("TechSmith Screen Capture Codec"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_TSCC, .priv_data_size = sizeof(CamtasiaContext), @@ -182,5 +183,4 @@ AVCodec ff_tscc_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("TechSmith Screen Capture Codec"), }; diff --git a/libavcodec/tscc2.c b/libavcodec/tscc2.c index aae7119e3a..3d22fd7ce9 100644 --- a/libavcodec/tscc2.c +++ b/libavcodec/tscc2.c @@ -374,6 +374,7 @@ static av_cold int tscc2_decode_init(AVCodecContext *avctx) AVCodec ff_tscc2_decoder = { .name = "tscc2", + .long_name = NULL_IF_CONFIG_SMALL("TechSmith Screen Codec 2"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_TSCC2, .priv_data_size = sizeof(TSCC2Context), @@ -381,5 +382,4 @@ AVCodec ff_tscc2_decoder = { .close = tscc2_decode_end, .decode = tscc2_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("TechSmith Screen Codec 2"), }; diff --git a/libavcodec/tta.c b/libavcodec/tta.c index e9c4285dd6..53c8acaa6e 100644 --- a/libavcodec/tta.c +++ b/libavcodec/tta.c @@ -468,6 +468,7 @@ static av_cold int tta_decode_close(AVCodecContext *avctx) { AVCodec ff_tta_decoder = { .name = "tta", + .long_name = NULL_IF_CONFIG_SMALL("TTA (True Audio)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_TTA, .priv_data_size = sizeof(TTAContext), @@ -475,5 +476,4 @@ AVCodec ff_tta_decoder = { .close = tta_decode_close, .decode = tta_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("TTA (True Audio)"), }; diff --git a/libavcodec/twinvqdec.c b/libavcodec/twinvqdec.c index 580c1f2040..3b889f5bec 100644 --- a/libavcodec/twinvqdec.c +++ b/libavcodec/twinvqdec.c @@ -409,6 +409,7 @@ static av_cold int twinvq_decode_init(AVCodecContext *avctx) AVCodec ff_twinvq_decoder = { .name = "twinvq", + .long_name = NULL_IF_CONFIG_SMALL("VQF TwinVQ"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_TWINVQ, .priv_data_size = sizeof(TwinVQContext), @@ -416,7 +417,6 @@ AVCodec ff_twinvq_decoder = { .close = ff_twinvq_decode_close, .decode = ff_twinvq_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("VQF TwinVQ"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, }; diff --git a/libavcodec/txd.c b/libavcodec/txd.c index a2d123e490..0eca07f76c 100644 --- a/libavcodec/txd.c +++ b/libavcodec/txd.c @@ -128,9 +128,9 @@ unsupported: AVCodec ff_txd_decoder = { .name = "txd", + .long_name = NULL_IF_CONFIG_SMALL("Renderware TXD (TeXture Dictionary) image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_TXD, .decode = txd_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Renderware TXD (TeXture Dictionary) image"), }; diff --git a/libavcodec/ulti.c b/libavcodec/ulti.c index 3825980cfb..4f787a39e2 100644 --- a/libavcodec/ulti.c +++ b/libavcodec/ulti.c @@ -419,6 +419,7 @@ err: AVCodec ff_ulti_decoder = { .name = "ultimotion", + .long_name = NULL_IF_CONFIG_SMALL("IBM UltiMotion"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_ULTI, .priv_data_size = sizeof(UltimotionDecodeContext), @@ -426,5 +427,4 @@ AVCodec ff_ulti_decoder = { .close = ulti_decode_end, .decode = ulti_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("IBM UltiMotion"), }; diff --git a/libavcodec/utvideodec.c b/libavcodec/utvideodec.c index bd67f9e548..349259577b 100644 --- a/libavcodec/utvideodec.c +++ b/libavcodec/utvideodec.c @@ -548,6 +548,7 @@ static av_cold int decode_end(AVCodecContext *avctx) AVCodec ff_utvideo_decoder = { .name = "utvideo", + .long_name = NULL_IF_CONFIG_SMALL("Ut Video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_UTVIDEO, .priv_data_size = sizeof(UtvideoContext), @@ -555,5 +556,4 @@ AVCodec ff_utvideo_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, - .long_name = NULL_IF_CONFIG_SMALL("Ut Video"), }; diff --git a/libavcodec/utvideoenc.c b/libavcodec/utvideoenc.c index 5fe86f0deb..36ac335e19 100644 --- a/libavcodec/utvideoenc.c +++ b/libavcodec/utvideoenc.c @@ -600,6 +600,7 @@ static int utvideo_encode_frame(AVCodecContext *avctx, AVPacket *pkt, AVCodec ff_utvideo_encoder = { .name = "utvideo", + .long_name = NULL_IF_CONFIG_SMALL("Ut Video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_UTVIDEO, .priv_data_size = sizeof(UtvideoContext), @@ -610,5 +611,4 @@ AVCodec ff_utvideo_encoder = { AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Ut Video"), }; diff --git a/libavcodec/v210dec.c b/libavcodec/v210dec.c index b8b647e6f6..8827397071 100644 --- a/libavcodec/v210dec.c +++ b/libavcodec/v210dec.c @@ -108,10 +108,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVCodec ff_v210_decoder = { .name = "v210", + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_V210, .init = decode_init, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), }; diff --git a/libavcodec/v210enc.c b/libavcodec/v210enc.c index ad8a4a537b..7efbb9607c 100644 --- a/libavcodec/v210enc.c +++ b/libavcodec/v210enc.c @@ -118,11 +118,11 @@ static av_cold int encode_close(AVCodecContext *avctx) AVCodec ff_v210_encoder = { .name = "v210", + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_V210, .init = encode_init, .encode2 = encode_frame, .close = encode_close, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV422P10, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), }; diff --git a/libavcodec/v210x.c b/libavcodec/v210x.c index 75eb0083c9..2922c05175 100644 --- a/libavcodec/v210x.c +++ b/libavcodec/v210x.c @@ -122,10 +122,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVCodec ff_v210x_decoder = { .name = "v210x", + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_V210X, .init = decode_init, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), }; diff --git a/libavcodec/v410dec.c b/libavcodec/v410dec.c index e4b2a7ded3..07be502276 100644 --- a/libavcodec/v410dec.c +++ b/libavcodec/v410dec.c @@ -91,10 +91,10 @@ static int v410_decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_v410_decoder = { .name = "v410", + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:4:4 10-bit"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_V410, .init = v410_decode_init, .decode = v410_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:4:4 10-bit"), }; diff --git a/libavcodec/v410enc.c b/libavcodec/v410enc.c index 7bb70fd56a..91cd823bb8 100644 --- a/libavcodec/v410enc.c +++ b/libavcodec/v410enc.c @@ -90,11 +90,11 @@ static av_cold int v410_encode_close(AVCodecContext *avctx) AVCodec ff_v410_encoder = { .name = "v410", + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:4:4 10-bit"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_V410, .init = v410_encode_init, .encode2 = v410_encode_frame, .close = v410_encode_close, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV444P10, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:4:4 10-bit"), }; diff --git a/libavcodec/vb.c b/libavcodec/vb.c index df0fef98d2..56094d8b9d 100644 --- a/libavcodec/vb.c +++ b/libavcodec/vb.c @@ -264,12 +264,12 @@ static av_cold int decode_end(AVCodecContext *avctx) AVCodec ff_vb_decoder = { .name = "vb", + .long_name = NULL_IF_CONFIG_SMALL("Beam Software VB"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_VB, .priv_data_size = sizeof(VBDecContext), .init = decode_init, .close = decode_end, .decode = decode_frame, - .long_name = NULL_IF_CONFIG_SMALL("Beam Software VB"), .capabilities = CODEC_CAP_DR1, }; diff --git a/libavcodec/vble.c b/libavcodec/vble.c index 6cd2dfc2e5..a349d8fe59 100644 --- a/libavcodec/vble.c +++ b/libavcodec/vble.c @@ -199,6 +199,7 @@ static av_cold int vble_decode_init(AVCodecContext *avctx) AVCodec ff_vble_decoder = { .name = "vble", + .long_name = NULL_IF_CONFIG_SMALL("VBLE Lossless Codec"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_VBLE, .priv_data_size = sizeof(VBLEContext), @@ -206,5 +207,4 @@ AVCodec ff_vble_decoder = { .close = vble_decode_close, .decode = vble_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("VBLE Lossless Codec"), }; diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 803c8be4b9..caedfd8fe7 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -6128,6 +6128,7 @@ static const enum AVPixelFormat vc1_hwaccel_pixfmt_list_420[] = { AVCodec ff_vc1_decoder = { .name = "vc1", + .long_name = NULL_IF_CONFIG_SMALL("SMPTE VC-1"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_VC1, .priv_data_size = sizeof(VC1Context), @@ -6136,7 +6137,6 @@ AVCodec ff_vc1_decoder = { .decode = vc1_decode_frame, .flush = ff_mpeg_flush, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY, - .long_name = NULL_IF_CONFIG_SMALL("SMPTE VC-1"), .pix_fmts = vc1_hwaccel_pixfmt_list_420, .profiles = NULL_IF_CONFIG_SMALL(profiles) }; @@ -6144,6 +6144,7 @@ AVCodec ff_vc1_decoder = { #if CONFIG_WMV3_DECODER AVCodec ff_wmv3_decoder = { .name = "wmv3", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_WMV3, .priv_data_size = sizeof(VC1Context), @@ -6152,7 +6153,6 @@ AVCodec ff_wmv3_decoder = { .decode = vc1_decode_frame, .flush = ff_mpeg_flush, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY, - .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9"), .pix_fmts = vc1_hwaccel_pixfmt_list_420, .profiles = NULL_IF_CONFIG_SMALL(profiles) }; @@ -6161,6 +6161,7 @@ AVCodec ff_wmv3_decoder = { #if CONFIG_WMV3IMAGE_DECODER AVCodec ff_wmv3image_decoder = { .name = "wmv3image", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9 Image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_WMV3IMAGE, .priv_data_size = sizeof(VC1Context), @@ -6169,7 +6170,6 @@ AVCodec ff_wmv3image_decoder = { .decode = vc1_decode_frame, .capabilities = CODEC_CAP_DR1, .flush = vc1_sprite_flush, - .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9 Image"), .pix_fmts = ff_pixfmt_list_420 }; #endif @@ -6177,6 +6177,7 @@ AVCodec ff_wmv3image_decoder = { #if CONFIG_VC1IMAGE_DECODER AVCodec ff_vc1image_decoder = { .name = "vc1image", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9 Image v2"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_VC1IMAGE, .priv_data_size = sizeof(VC1Context), @@ -6185,7 +6186,6 @@ AVCodec ff_vc1image_decoder = { .decode = vc1_decode_frame, .capabilities = CODEC_CAP_DR1, .flush = vc1_sprite_flush, - .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9 Image v2"), .pix_fmts = ff_pixfmt_list_420 }; #endif diff --git a/libavcodec/vcr1.c b/libavcodec/vcr1.c index dd8bcf0ccf..161704f545 100644 --- a/libavcodec/vcr1.c +++ b/libavcodec/vcr1.c @@ -132,11 +132,11 @@ packet_small: AVCodec ff_vcr1_decoder = { .name = "vcr1", + .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_VCR1, .priv_data_size = sizeof(VCR1Context), .init = vcr1_decode_init, .decode = vcr1_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"), }; diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c index 293a8ad81b..b1ecace93a 100644 --- a/libavcodec/vmdav.c +++ b/libavcodec/vmdav.c @@ -653,6 +653,7 @@ static int vmdaudio_decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_vmdvideo_decoder = { .name = "vmdvideo", + .long_name = NULL_IF_CONFIG_SMALL("Sierra VMD video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_VMDVIDEO, .priv_data_size = sizeof(VmdVideoContext), @@ -660,16 +661,15 @@ AVCodec ff_vmdvideo_decoder = { .close = vmdvideo_decode_end, .decode = vmdvideo_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Sierra VMD video"), }; AVCodec ff_vmdaudio_decoder = { .name = "vmdaudio", + .long_name = NULL_IF_CONFIG_SMALL("Sierra VMD audio"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_VMDAUDIO, .priv_data_size = sizeof(VmdAudioContext), .init = vmdaudio_decode_init, .decode = vmdaudio_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Sierra VMD audio"), }; diff --git a/libavcodec/vmnc.c b/libavcodec/vmnc.c index d060d5b81f..6ddfdaf4fc 100644 --- a/libavcodec/vmnc.c +++ b/libavcodec/vmnc.c @@ -514,6 +514,7 @@ static av_cold int decode_end(AVCodecContext *avctx) AVCodec ff_vmnc_decoder = { .name = "vmnc", + .long_name = NULL_IF_CONFIG_SMALL("VMware Screen Codec / VMware Video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_VMNC, .priv_data_size = sizeof(VmncContext), @@ -521,5 +522,4 @@ AVCodec ff_vmnc_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("VMware Screen Codec / VMware Video"), }; diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c index 25c5958063..d7fec98c6e 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -1761,6 +1761,7 @@ static av_cold void vorbis_decode_flush(AVCodecContext *avctx) AVCodec ff_vorbis_decoder = { .name = "vorbis", + .long_name = NULL_IF_CONFIG_SMALL("Vorbis"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_VORBIS, .priv_data_size = sizeof(vorbis_context), @@ -1769,7 +1770,6 @@ AVCodec ff_vorbis_decoder = { .decode = vorbis_decode_frame, .flush = vorbis_decode_flush, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Vorbis"), .channel_layouts = ff_vorbis_channel_layouts, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c index e47f9965e9..f16060e450 100644 --- a/libavcodec/vorbisenc.c +++ b/libavcodec/vorbisenc.c @@ -1195,6 +1195,7 @@ error: AVCodec ff_vorbis_encoder = { .name = "vorbis", + .long_name = NULL_IF_CONFIG_SMALL("Vorbis"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_VORBIS, .priv_data_size = sizeof(vorbis_enc_context), @@ -1204,5 +1205,4 @@ AVCodec ff_vorbis_encoder = { .capabilities = CODEC_CAP_DELAY | CODEC_CAP_EXPERIMENTAL, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Vorbis"), }; diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index a269dc3320..b326a1c60b 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2425,6 +2425,7 @@ static av_cold int theora_decode_init(AVCodecContext *avctx) AVCodec ff_theora_decoder = { .name = "theora", + .long_name = NULL_IF_CONFIG_SMALL("Theora"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_THEORA, .priv_data_size = sizeof(Vp3DecodeContext), @@ -2434,7 +2435,6 @@ AVCodec ff_theora_decoder = { .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_FRAME_THREADS, .flush = vp3_decode_flush, - .long_name = NULL_IF_CONFIG_SMALL("Theora"), .init_thread_copy = ONLY_IF_THREADS_ENABLED(vp3_init_thread_copy), .update_thread_context = ONLY_IF_THREADS_ENABLED(vp3_update_thread_context) }; @@ -2442,6 +2442,7 @@ AVCodec ff_theora_decoder = { AVCodec ff_vp3_decoder = { .name = "vp3", + .long_name = NULL_IF_CONFIG_SMALL("On2 VP3"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_VP3, .priv_data_size = sizeof(Vp3DecodeContext), @@ -2451,7 +2452,6 @@ AVCodec ff_vp3_decoder = { .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_FRAME_THREADS, .flush = vp3_decode_flush, - .long_name = NULL_IF_CONFIG_SMALL("On2 VP3"), .init_thread_copy = ONLY_IF_THREADS_ENABLED(vp3_init_thread_copy), .update_thread_context = ONLY_IF_THREADS_ENABLED(vp3_update_thread_context), }; diff --git a/libavcodec/vp5.c b/libavcodec/vp5.c index 1415428ee8..f4d1c7feea 100644 --- a/libavcodec/vp5.c +++ b/libavcodec/vp5.c @@ -281,6 +281,7 @@ static av_cold int vp5_decode_init(AVCodecContext *avctx) AVCodec ff_vp5_decoder = { .name = "vp5", + .long_name = NULL_IF_CONFIG_SMALL("On2 VP5"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_VP5, .priv_data_size = sizeof(VP56Context), @@ -288,5 +289,4 @@ AVCodec ff_vp5_decoder = { .close = ff_vp56_free, .decode = ff_vp56_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("On2 VP5"), }; diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c index 54dc3781ce..b8a92287a9 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -628,6 +628,7 @@ static av_cold int vp6_decode_free(AVCodecContext *avctx) AVCodec ff_vp6_decoder = { .name = "vp6", + .long_name = NULL_IF_CONFIG_SMALL("On2 VP6"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_VP6, .priv_data_size = sizeof(VP56Context), @@ -635,12 +636,12 @@ AVCodec ff_vp6_decoder = { .close = vp6_decode_free, .decode = ff_vp56_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("On2 VP6"), }; /* flash version, not flipped upside-down */ AVCodec ff_vp6f_decoder = { .name = "vp6f", + .long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_VP6F, .priv_data_size = sizeof(VP56Context), @@ -648,12 +649,12 @@ AVCodec ff_vp6f_decoder = { .close = vp6_decode_free, .decode = ff_vp56_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version)"), }; /* flash version, not flipped upside-down, with alpha channel */ AVCodec ff_vp6a_decoder = { .name = "vp6a", + .long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version, with alpha channel)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_VP6A, .priv_data_size = sizeof(VP56Context), @@ -661,5 +662,4 @@ AVCodec ff_vp6a_decoder = { .close = vp6_decode_free, .decode = ff_vp56_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version, with alpha channel)"), }; diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 3c60aa3409..5b11cd1a85 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -2107,6 +2107,7 @@ static int vp8_decode_update_thread_context(AVCodecContext *dst, const AVCodecCo AVCodec ff_vp8_decoder = { .name = "vp8", + .long_name = NULL_IF_CONFIG_SMALL("On2 VP8"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_VP8, .priv_data_size = sizeof(VP8Context), @@ -2115,7 +2116,6 @@ AVCodec ff_vp8_decoder = { .decode = ff_vp8_decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS | CODEC_CAP_SLICE_THREADS, .flush = vp8_decode_flush, - .long_name = NULL_IF_CONFIG_SMALL("On2 VP8"), .init_thread_copy = ONLY_IF_THREADS_ENABLED(vp8_decode_init_thread_copy), .update_thread_context = ONLY_IF_THREADS_ENABLED(vp8_decode_update_thread_context), }; diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c index 98f82ad571..86f2fcfbcd 100644 --- a/libavcodec/vqavideo.c +++ b/libavcodec/vqavideo.c @@ -639,6 +639,7 @@ static av_cold int vqa_decode_end(AVCodecContext *avctx) AVCodec ff_vqa_decoder = { .name = "vqavideo", + .long_name = NULL_IF_CONFIG_SMALL("Westwood Studios VQA (Vector Quantized Animation) video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_WS_VQA, .priv_data_size = sizeof(VqaContext), @@ -646,5 +647,4 @@ AVCodec ff_vqa_decoder = { .close = vqa_decode_end, .decode = vqa_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Westwood Studios VQA (Vector Quantized Animation) video"), }; diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index 0847238595..bdc2a81d44 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -1224,6 +1224,7 @@ static int wavpack_decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_wavpack_decoder = { .name = "wavpack", + .long_name = NULL_IF_CONFIG_SMALL("WavPack"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_WAVPACK, .priv_data_size = sizeof(WavpackContext), @@ -1232,5 +1233,4 @@ AVCodec ff_wavpack_decoder = { .decode = wavpack_decode_frame, .flush = wavpack_decode_flush, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("WavPack"), }; diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index b9b176eeae..2dd5898d76 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -928,6 +928,7 @@ static av_cold void flush(AVCodecContext *avctx) AVCodec ff_wmav1_decoder = { .name = "wmav1", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 1"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_WMAV1, .priv_data_size = sizeof(WMACodecContext), @@ -936,13 +937,13 @@ AVCodec ff_wmav1_decoder = { .decode = wma_decode_superframe, .flush = flush, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 1"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, }; AVCodec ff_wmav2_decoder = { .name = "wmav2", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 2"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_WMAV2, .priv_data_size = sizeof(WMACodecContext), @@ -951,7 +952,6 @@ AVCodec ff_wmav2_decoder = { .decode = wma_decode_superframe, .flush = flush, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 2"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, }; diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c index f5bdb678e2..899cae0567 100644 --- a/libavcodec/wmaenc.c +++ b/libavcodec/wmaenc.c @@ -417,6 +417,7 @@ static int encode_superframe(AVCodecContext *avctx, AVPacket *avpkt, AVCodec ff_wmav1_encoder = { .name = "wmav1", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 1"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_WMAV1, .priv_data_size = sizeof(WMACodecContext), @@ -425,11 +426,11 @@ AVCodec ff_wmav1_encoder = { .close = ff_wma_end, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 1"), }; AVCodec ff_wmav2_encoder = { .name = "wmav2", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 2"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_WMAV2, .priv_data_size = sizeof(WMACodecContext), @@ -438,5 +439,4 @@ AVCodec ff_wmav2_encoder = { .close = ff_wma_end, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 2"), }; diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c index 75b47209a0..2f341c01c4 100644 --- a/libavcodec/wmalosslessdec.c +++ b/libavcodec/wmalosslessdec.c @@ -1299,6 +1299,7 @@ static av_cold int decode_close(AVCodecContext *avctx) AVCodec ff_wmalossless_decoder = { .name = "wmalossless", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio Lossless"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_WMALOSSLESS, .priv_data_size = sizeof(WmallDecodeCtx), @@ -1307,7 +1308,6 @@ AVCodec ff_wmalossless_decoder = { .decode = decode_packet, .flush = flush, .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1 | CODEC_CAP_DELAY, - .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio Lossless"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_S32P, AV_SAMPLE_FMT_NONE }, diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index bbf3216076..2657a0ef10 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -1640,6 +1640,7 @@ static void flush(AVCodecContext *avctx) */ AVCodec ff_wmapro_decoder = { .name = "wmapro", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 9 Professional"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_WMAPRO, .priv_data_size = sizeof(WMAProDecodeCtx), @@ -1648,7 +1649,6 @@ AVCodec ff_wmapro_decoder = { .decode = decode_packet, .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1, .flush = flush, - .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 9 Professional"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, }; diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c index 0ba2c48d32..0d91077eca 100644 --- a/libavcodec/wmavoice.c +++ b/libavcodec/wmavoice.c @@ -2066,6 +2066,7 @@ static av_cold void wmavoice_flush(AVCodecContext *ctx) AVCodec ff_wmavoice_decoder = { .name = "wmavoice", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio Voice"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_WMAVOICE, .priv_data_size = sizeof(WMAVoiceContext), @@ -2075,5 +2076,4 @@ AVCodec ff_wmavoice_decoder = { .decode = wmavoice_decode_packet, .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1, .flush = wmavoice_flush, - .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio Voice"), }; diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index f16b6de67e..740636c19e 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -466,6 +466,7 @@ static av_cold int wmv2_decode_end(AVCodecContext *avctx) AVCodec ff_wmv2_decoder = { .name = "wmv2", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 8"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_WMV2, .priv_data_size = sizeof(Wmv2Context), @@ -473,6 +474,5 @@ AVCodec ff_wmv2_decoder = { .close = wmv2_decode_end, .decode = ff_h263_decode_frame, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 8"), .pix_fmts = ff_pixfmt_list_420, }; diff --git a/libavcodec/wmv2enc.c b/libavcodec/wmv2enc.c index 930ee9aa73..256c4e546f 100644 --- a/libavcodec/wmv2enc.c +++ b/libavcodec/wmv2enc.c @@ -212,6 +212,7 @@ void ff_wmv2_encode_mb(MpegEncContext * s, AVCodec ff_wmv2_encoder = { .name = "wmv2", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 8"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_WMV2, .priv_data_size = sizeof(Wmv2Context), @@ -219,5 +220,4 @@ AVCodec ff_wmv2_encoder = { .encode2 = ff_MPV_encode_picture, .close = ff_MPV_encode_end, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 8"), }; diff --git a/libavcodec/wnv1.c b/libavcodec/wnv1.c index 13a875e584..7676c89080 100644 --- a/libavcodec/wnv1.c +++ b/libavcodec/wnv1.c @@ -151,11 +151,11 @@ static av_cold int decode_init(AVCodecContext *avctx) AVCodec ff_wnv1_decoder = { .name = "wnv1", + .long_name = NULL_IF_CONFIG_SMALL("Winnov WNV1"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_WNV1, .priv_data_size = sizeof(WNV1Context), .init = decode_init, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Winnov WNV1"), }; diff --git a/libavcodec/ws-snd1.c b/libavcodec/ws-snd1.c index 14a93354ef..fe6f8120e6 100644 --- a/libavcodec/ws-snd1.c +++ b/libavcodec/ws-snd1.c @@ -174,10 +174,10 @@ static int ws_snd_decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_ws_snd1_decoder = { .name = "ws_snd1", + .long_name = NULL_IF_CONFIG_SMALL("Westwood Audio (SND1)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_WESTWOOD_SND1, .init = ws_snd_decode_init, .decode = ws_snd_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Westwood Audio (SND1)"), }; diff --git a/libavcodec/xan.c b/libavcodec/xan.c index 8a33e79d50..ed2563cc62 100644 --- a/libavcodec/xan.c +++ b/libavcodec/xan.c @@ -607,6 +607,7 @@ static av_cold int xan_decode_end(AVCodecContext *avctx) AVCodec ff_xan_wc3_decoder = { .name = "xan_wc3", + .long_name = NULL_IF_CONFIG_SMALL("Wing Commander III / Xan"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_XAN_WC3, .priv_data_size = sizeof(XanContext), @@ -614,5 +615,4 @@ AVCodec ff_xan_wc3_decoder = { .close = xan_decode_end, .decode = xan_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Wing Commander III / Xan"), }; diff --git a/libavcodec/xbmenc.c b/libavcodec/xbmenc.c index e12debe033..8616372aa9 100644 --- a/libavcodec/xbmenc.c +++ b/libavcodec/xbmenc.c @@ -76,6 +76,7 @@ static av_cold int xbm_encode_close(AVCodecContext *avctx) AVCodec ff_xbm_encoder = { .name = "xbm", + .long_name = NULL_IF_CONFIG_SMALL("XBM (X BitMap) image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_XBM, .init = xbm_encode_init, @@ -83,5 +84,4 @@ AVCodec ff_xbm_encoder = { .close = xbm_encode_close, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_MONOWHITE, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("XBM (X BitMap) image"), }; diff --git a/libavcodec/xl.c b/libavcodec/xl.c index 65153b4511..8e9bdc66f6 100644 --- a/libavcodec/xl.c +++ b/libavcodec/xl.c @@ -132,10 +132,10 @@ static av_cold int decode_init(AVCodecContext *avctx) AVCodec ff_xl_decoder = { .name = "xl", + .long_name = NULL_IF_CONFIG_SMALL("Miro VideoXL"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_VIXL, .init = decode_init, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Miro VideoXL"), }; diff --git a/libavcodec/xsubdec.c b/libavcodec/xsubdec.c index 11e1d57fed..3d85973de6 100644 --- a/libavcodec/xsubdec.c +++ b/libavcodec/xsubdec.c @@ -138,9 +138,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVCodec ff_xsub_decoder = { .name = "xsub", + .long_name = NULL_IF_CONFIG_SMALL("XSUB"), .type = AVMEDIA_TYPE_SUBTITLE, .id = AV_CODEC_ID_XSUB, .init = decode_init, .decode = decode_frame, - .long_name = NULL_IF_CONFIG_SMALL("XSUB"), }; diff --git a/libavcodec/xsubenc.c b/libavcodec/xsubenc.c index 816e651a67..fc46fb8651 100644 --- a/libavcodec/xsubenc.c +++ b/libavcodec/xsubenc.c @@ -211,9 +211,9 @@ static av_cold int xsub_encoder_init(AVCodecContext *avctx) AVCodec ff_xsub_encoder = { .name = "xsub", + .long_name = NULL_IF_CONFIG_SMALL("DivX subtitles (XSUB)"), .type = AVMEDIA_TYPE_SUBTITLE, .id = AV_CODEC_ID_XSUB, .init = xsub_encoder_init, .encode_sub = xsub_encode, - .long_name = NULL_IF_CONFIG_SMALL("DivX subtitles (XSUB)"), }; diff --git a/libavcodec/xwddec.c b/libavcodec/xwddec.c index aa91b3b4d3..8963c96380 100644 --- a/libavcodec/xwddec.c +++ b/libavcodec/xwddec.c @@ -238,9 +238,9 @@ static int xwd_decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_xwd_decoder = { .name = "xwd", + .long_name = NULL_IF_CONFIG_SMALL("XWD (X Window Dump) image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_XWD, .decode = xwd_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("XWD (X Window Dump) image"), }; diff --git a/libavcodec/xwdenc.c b/libavcodec/xwdenc.c index c10146384b..87d6cff11b 100644 --- a/libavcodec/xwdenc.c +++ b/libavcodec/xwdenc.c @@ -222,6 +222,7 @@ static av_cold int xwd_encode_close(AVCodecContext *avctx) AVCodec ff_xwd_encoder = { .name = "xwd", + .long_name = NULL_IF_CONFIG_SMALL("XWD (X Window Dump) image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_XWD, .init = xwd_encode_init, @@ -248,5 +249,4 @@ AVCodec ff_xwd_encoder = { AV_PIX_FMT_PAL8, AV_PIX_FMT_MONOWHITE, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("XWD (X Window Dump) image"), }; diff --git a/libavcodec/xxan.c b/libavcodec/xxan.c index 05ce7ffae6..74463051e6 100644 --- a/libavcodec/xxan.c +++ b/libavcodec/xxan.c @@ -427,6 +427,7 @@ static av_cold int xan_decode_end(AVCodecContext *avctx) AVCodec ff_xan_wc4_decoder = { .name = "xan_wc4", + .long_name = NULL_IF_CONFIG_SMALL("Wing Commander IV / Xxan"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_XAN_WC4, .priv_data_size = sizeof(XanContext), @@ -434,5 +435,4 @@ AVCodec ff_xan_wc4_decoder = { .close = xan_decode_end, .decode = xan_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Wing Commander IV / Xxan"), }; diff --git a/libavcodec/yop.c b/libavcodec/yop.c index 3a760c5345..3434fd9808 100644 --- a/libavcodec/yop.c +++ b/libavcodec/yop.c @@ -245,11 +245,11 @@ static int yop_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVCodec ff_yop_decoder = { .name = "yop", + .long_name = NULL_IF_CONFIG_SMALL("Psygnosis YOP Video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_YOP, .priv_data_size = sizeof(YopDecContext), .init = yop_decode_init, .decode = yop_decode_frame, - .long_name = NULL_IF_CONFIG_SMALL("Psygnosis YOP Video"), .capabilities = CODEC_CAP_DR1, }; diff --git a/libavcodec/zerocodec.c b/libavcodec/zerocodec.c index e503aa7689..135a809d18 100644 --- a/libavcodec/zerocodec.c +++ b/libavcodec/zerocodec.c @@ -138,11 +138,11 @@ static av_cold int zerocodec_decode_init(AVCodecContext *avctx) AVCodec ff_zerocodec_decoder = { .type = AVMEDIA_TYPE_VIDEO, .name = "zerocodec", + .long_name = NULL_IF_CONFIG_SMALL("ZeroCodec Lossless Video"), .id = AV_CODEC_ID_ZEROCODEC, .priv_data_size = sizeof(ZeroCodecContext), .init = zerocodec_decode_init, .decode = zerocodec_decode_frame, .close = zerocodec_decode_close, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("ZeroCodec Lossless Video"), }; diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c index 65fa5ffece..d17f37a59f 100644 --- a/libavcodec/zmbv.c +++ b/libavcodec/zmbv.c @@ -655,6 +655,7 @@ static av_cold int decode_end(AVCodecContext *avctx) AVCodec ff_zmbv_decoder = { .name = "zmbv", + .long_name = NULL_IF_CONFIG_SMALL("Zip Motion Blocks Video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_ZMBV, .priv_data_size = sizeof(ZmbvContext), @@ -662,5 +663,4 @@ AVCodec ff_zmbv_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Zip Motion Blocks Video"), }; diff --git a/libavcodec/zmbvenc.c b/libavcodec/zmbvenc.c index 9ac7d6d471..c039383df5 100644 --- a/libavcodec/zmbvenc.c +++ b/libavcodec/zmbvenc.c @@ -339,6 +339,7 @@ static av_cold int encode_end(AVCodecContext *avctx) AVCodec ff_zmbv_encoder = { .name = "zmbv", + .long_name = NULL_IF_CONFIG_SMALL("Zip Motion Blocks Video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_ZMBV, .priv_data_size = sizeof(ZmbvEncContext), @@ -346,5 +347,4 @@ AVCodec ff_zmbv_encoder = { .encode2 = encode_frame, .close = encode_end, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_PAL8, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Zip Motion Blocks Video"), }; |