diff options
267 files changed, 338 insertions, 338 deletions
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index d66e130b65..a73f8d59fc 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -1020,6 +1020,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), @@ -1027,5 +1028,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 0e091460e0..d01ef924c7 100644 --- a/libavcodec/8bps.c +++ b/libavcodec/8bps.c @@ -178,11 +178,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 82fda6f449..eff525c951 100644 --- a/libavcodec/8svx.c +++ b/libavcodec/8svx.c @@ -187,6 +187,7 @@ static av_cold int eightsvx_decode_close(AVCodecContext *avctx) #if CONFIG_EIGHTSVX_FIB_DECODER 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), @@ -194,7 +195,6 @@ AVCodec ff_eightsvx_fib_decoder = { .decode = eightsvx_decode_frame, .close = eightsvx_decode_close, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("8SVX fibonacci"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_U8P, AV_SAMPLE_FMT_NONE }, }; @@ -202,6 +202,7 @@ AVCodec ff_eightsvx_fib_decoder = { #if CONFIG_EIGHTSVX_EXP_DECODER 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), @@ -209,7 +210,6 @@ AVCodec ff_eightsvx_exp_decoder = { .decode = eightsvx_decode_frame, .close = eightsvx_decode_close, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("8SVX exponential"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_U8P, AV_SAMPLE_FMT_NONE }, }; diff --git a/libavcodec/a64multienc.c b/libavcodec/a64multienc.c index eaf7b46b55..e5c0fa782f 100644 --- a/libavcodec/a64multienc.c +++ b/libavcodec/a64multienc.c @@ -396,6 +396,7 @@ static int a64multi_encode_frame(AVCodecContext *avctx, AVPacket *pkt, #if CONFIG_A64MULTI_ENCODER 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), @@ -403,13 +404,13 @@ 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, }; #endif #if CONFIG_A64MULTI5_ENCODER 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), @@ -417,7 +418,6 @@ 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, }; #endif diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 34205057b7..63a7fd18df 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -3258,13 +3258,13 @@ static const AVClass aac_decoder_class = { 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 }, @@ -3281,13 +3281,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 3227edb5c6..5596b4bfad 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -815,6 +815,7 @@ static const int mpeg4audio_sample_rates[16] = { 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), @@ -826,6 +827,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 45d131aeb8..38658f86c4 100644 --- a/libavcodec/aasc.c +++ b/libavcodec/aasc.c @@ -151,6 +151,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), @@ -158,5 +159,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 20b4b616eb..f91ded0fcb 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -1453,6 +1453,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), @@ -1460,7 +1461,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, @@ -1476,6 +1476,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), @@ -1483,7 +1484,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 5d8dd5c3f1..b1f9c21385 100644 --- a/libavcodec/ac3enc_fixed.c +++ b/libavcodec/ac3enc_fixed.c @@ -154,6 +154,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), @@ -162,7 +163,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 7864f41019..532c56c4e6 100644 --- a/libavcodec/ac3enc_float.c +++ b/libavcodec/ac3enc_float.c @@ -152,6 +152,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), @@ -160,7 +161,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 dbbb358b44..8e20de2a63 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -1532,13 +1532,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 cef8b6f916..5391570de7 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 7d7fe3ae64..e59cc92984 100644 --- a/libavcodec/adxdec.c +++ b/libavcodec/adxdec.c @@ -174,6 +174,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), @@ -181,7 +182,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 df07c81189..05e32455c7 100644 --- a/libavcodec/adxenc.c +++ b/libavcodec/adxenc.c @@ -158,6 +158,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), @@ -165,5 +166,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 70e9f3f103..a7e3691aa0 100644 --- a/libavcodec/aic.c +++ b/libavcodec/aic.c @@ -470,6 +470,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), @@ -477,5 +478,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 cf19484fe6..3f37f61883 100644 --- a/libavcodec/alac.c +++ b/libavcodec/alac.c @@ -626,6 +626,7 @@ static int init_thread_copy(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), @@ -634,5 +635,4 @@ AVCodec ff_alac_decoder = { .decode = alac_decode_frame, .init_thread_copy = ONLY_IF_THREADS_ENABLED(init_thread_copy), .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, - .long_name = NULL_IF_CONFIG_SMALL("ALAC (Apple Lossless Audio Codec)"), }; diff --git a/libavcodec/alacenc.c b/libavcodec/alacenc.c index 42068926d0..bc68a06d25 100644 --- a/libavcodec/alacenc.c +++ b/libavcodec/alacenc.c @@ -634,6 +634,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), @@ -645,5 +646,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 19f348651c..7b99d8689e 100644 --- a/libavcodec/alsdec.c +++ b/libavcodec/alsdec.c @@ -1786,6 +1786,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), @@ -1794,5 +1795,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 6376db11ef..43ddb625eb 100644 --- a/libavcodec/amrnbdec.c +++ b/libavcodec/amrnbdec.c @@ -1082,13 +1082,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 8c3eb56d3b..bf668bbd4b 100644 --- a/libavcodec/amrwbdec.c +++ b/libavcodec/amrwbdec.c @@ -1267,13 +1267,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 9aef6d38da..79a87dde99 100644 --- a/libavcodec/anm.c +++ b/libavcodec/anm.c @@ -189,6 +189,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), @@ -196,5 +197,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 68132dfb1c..8dce61a8c6 100644 --- a/libavcodec/ansi.c +++ b/libavcodec/ansi.c @@ -466,6 +466,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), @@ -473,5 +474,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 1f55dab851..ea71ea0ef3 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -1569,6 +1569,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), @@ -1577,7 +1578,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 14bbeb74ad..038b461db1 100644 --- a/libavcodec/asvdec.c +++ b/libavcodec/asvdec.c @@ -310,6 +310,7 @@ static av_cold int decode_end(AVCodecContext *avctx) #if CONFIG_ASV1_DECODER 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), @@ -317,13 +318,13 @@ AVCodec ff_asv1_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("ASUS V1"), }; #endif #if CONFIG_ASV2_DECODER 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), @@ -331,7 +332,6 @@ AVCodec ff_asv2_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("ASUS V2"), }; #endif diff --git a/libavcodec/asvenc.c b/libavcodec/asvenc.c index a09aa73ce0..38d971abcb 100644 --- a/libavcodec/asvenc.c +++ b/libavcodec/asvenc.c @@ -262,6 +262,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), @@ -269,13 +270,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), @@ -283,6 +284,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 34d46ae607..8d0f16a4de 100644 --- a/libavcodec/aura.c +++ b/libavcodec/aura.c @@ -99,10 +99,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 e3733d7711..065345b5cd 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 474265f1bd..71d111f893 100644 --- a/libavcodec/bethsoftvideo.c +++ b/libavcodec/bethsoftvideo.c @@ -151,6 +151,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), @@ -158,5 +159,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 924d7f8353..c7ac3782cb 100644 --- a/libavcodec/bfi.c +++ b/libavcodec/bfi.c @@ -177,6 +177,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), @@ -184,5 +185,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 dec5f09c8c..8878694777 100644 --- a/libavcodec/bink.c +++ b/libavcodec/bink.c @@ -1334,12 +1334,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 6d94c99f32..b7ad41897f 100644 --- a/libavcodec/binkaudio.c +++ b/libavcodec/binkaudio.c @@ -335,6 +335,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), @@ -342,11 +343,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), @@ -354,5 +355,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 51459e5eae..404c47dece 100644 --- a/libavcodec/bmp.c +++ b/libavcodec/bmp.c @@ -330,9 +330,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 a29a1d564c..ad02a6b314 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, .init = bmp_encode_init, @@ -172,5 +173,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 d7da4c5384..baa1c8b6f7 100644 --- a/libavcodec/bmv.c +++ b/libavcodec/bmv.c @@ -340,21 +340,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 bb44f38791..f25368b101 100644 --- a/libavcodec/c93.c +++ b/libavcodec/c93.c @@ -254,6 +254,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), @@ -261,5 +262,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 5e7c0ce924..4a8d21b2ac 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -1217,6 +1217,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), @@ -1225,5 +1226,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 d29231758a..b7a8fa7ba2 100644 --- a/libavcodec/cdgraphics.c +++ b/libavcodec/cdgraphics.c @@ -370,6 +370,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), @@ -377,5 +378,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 e6bcaeaa09..93a5537e3e 100644 --- a/libavcodec/cdxl.c +++ b/libavcodec/cdxl.c @@ -298,6 +298,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), @@ -305,5 +306,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 f5bc113232..082d0b232a 100644 --- a/libavcodec/cinepak.c +++ b/libavcodec/cinepak.c @@ -477,6 +477,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), @@ -484,5 +485,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 cf004b4524..51ac10662a 100644 --- a/libavcodec/cljr.c +++ b/libavcodec/cljr.c @@ -87,12 +87,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 @@ -177,6 +177,7 @@ static const AVClass cljr_class = { 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), @@ -184,7 +185,6 @@ 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"), .priv_class = &cljr_class, }; #endif diff --git a/libavcodec/cllc.c b/libavcodec/cllc.c index ab8d46aa52..ee77381fd8 100644 --- a/libavcodec/cllc.c +++ b/libavcodec/cllc.c @@ -481,6 +481,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), @@ -488,5 +489,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 675f77d203..12241c3b91 100644 --- a/libavcodec/cngdec.c +++ b/libavcodec/cngdec.c @@ -157,6 +157,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), @@ -164,7 +165,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 4ab3019247..5ab6e365c1 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 08cd4017fc..083d26bf6f 100644 --- a/libavcodec/cook.c +++ b/libavcodec/cook.c @@ -1279,6 +1279,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), @@ -1286,7 +1287,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 0a5fa69186..e875dd779e 100644 --- a/libavcodec/cscd.c +++ b/libavcodec/cscd.c @@ -159,6 +159,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), @@ -166,5 +167,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 3a30138efb..c68612314e 100644 --- a/libavcodec/cyuv.c +++ b/libavcodec/cyuv.c @@ -178,25 +178,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 fbe9b01896..613e60b02a 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -2507,13 +2507,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 bba7626cb7..b1be475ef2 100644 --- a/libavcodec/dfa.c +++ b/libavcodec/dfa.c @@ -408,6 +408,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), @@ -415,5 +416,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 e96369be9a..15e6c679e4 100644 --- a/libavcodec/dnxhddec.c +++ b/libavcodec/dnxhddec.c @@ -413,6 +413,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), @@ -420,5 +421,4 @@ AVCodec ff_dnxhd_decoder = { .close = dnxhd_decode_close, .decode = dnxhd_decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, - .long_name = NULL_IF_CONFIG_SMALL("VC3/DNxHD"), }; diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 8d2b8b3e72..5cf6d8b0f3 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -1037,6 +1037,7 @@ static const AVCodecDefault dnxhd_defaults[] = { 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), @@ -1047,7 +1048,6 @@ 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 = &dnxhd_class, .defaults = dnxhd_defaults, }; diff --git a/libavcodec/dpcm.c b/libavcodec/dpcm.c index 402b0f9706..0c0bcca816 100644 --- a/libavcodec/dpcm.c +++ b/libavcodec/dpcm.c @@ -328,13 +328,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 a910eac5d0..6c3d53604a 100644 --- a/libavcodec/dpx.c +++ b/libavcodec/dpx.c @@ -257,9 +257,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 c3e43983cc..1f1c7720a5 100644 --- a/libavcodec/dpxenc.c +++ b/libavcodec/dpxenc.c @@ -235,6 +235,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), @@ -247,5 +248,4 @@ AVCodec ff_dpx_encoder = { AV_PIX_FMT_GBRP10LE, AV_PIX_FMT_GBRP10BE, AV_PIX_FMT_GBRP12LE, AV_PIX_FMT_GBRP12BE, AV_PIX_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("DPX image"), }; diff --git a/libavcodec/dsicinav.c b/libavcodec/dsicinav.c index 55c2742366..14bba55e1d 100644 --- a/libavcodec/dsicinav.c +++ b/libavcodec/dsicinav.c @@ -397,6 +397,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), @@ -404,16 +405,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 5a62bf2295..ba07c71905 100644 --- a/libavcodec/dv.c +++ b/libavcodec/dv.c @@ -984,6 +984,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), @@ -993,6 +994,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 562db6a586..f30b7674f7 100644 --- a/libavcodec/dvbsub.c +++ b/libavcodec/dvbsub.c @@ -456,9 +456,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 ab09e4f8a3..4ce40aac83 100644 --- a/libavcodec/dvbsubdec.c +++ b/libavcodec/dvbsubdec.c @@ -1544,11 +1544,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 48cbbfc70e..b86926a5a7 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), @@ -378,5 +379,4 @@ AVCodec ff_dvvideo_decoder = { .decode = dvvideo_decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_SLICE_THREADS, .max_lowres = 3, - .long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"), }; diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c index b2445ebc1b..f0dd289139 100644 --- a/libavcodec/dvdsubdec.c +++ b/libavcodec/dvdsubdec.c @@ -655,12 +655,12 @@ static const AVClass dvdsub_class = { 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, .close = dvdsub_close, - .long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"), .priv_class = &dvdsub_class, }; diff --git a/libavcodec/dvdsubenc.c b/libavcodec/dvdsubenc.c index 6e196235cb..8130b74a7a 100644 --- a/libavcodec/dvdsubenc.c +++ b/libavcodec/dvdsubenc.c @@ -434,10 +434,10 @@ 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, .init = dvdsub_init, .encode_sub = dvdsub_encode, - .long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"), .priv_data_size = sizeof(DVDSubtitleContext), }; diff --git a/libavcodec/dxa.c b/libavcodec/dxa.c index 36fef90996..2704852768 100644 --- a/libavcodec/dxa.c +++ b/libavcodec/dxa.c @@ -350,6 +350,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), @@ -357,5 +358,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 8b89b1eacc..9944617531 100644 --- a/libavcodec/eac3enc.c +++ b/libavcodec/eac3enc.c @@ -254,6 +254,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), @@ -262,7 +263,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 31b9b0d059..3f22c74798 100644 --- a/libavcodec/eacmv.c +++ b/libavcodec/eacmv.c @@ -225,6 +225,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), @@ -232,5 +233,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 b6bf86d307..6d8291e514 100644 --- a/libavcodec/eamad.c +++ b/libavcodec/eamad.c @@ -321,6 +321,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), @@ -328,5 +329,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 3db6f84734..a24550b795 100644 --- a/libavcodec/eatgq.c +++ b/libavcodec/eatgq.c @@ -242,11 +242,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 deda86e087..bfdfb76b9b 100644 --- a/libavcodec/eatgv.c +++ b/libavcodec/eatgv.c @@ -353,12 +353,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 1484ddc998..262deb1cdd 100644 --- a/libavcodec/eatqi.c +++ b/libavcodec/eatqi.c @@ -147,6 +147,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), @@ -154,5 +155,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 d0a964fee5..a050fcb4e9 100644 --- a/libavcodec/escape124.c +++ b/libavcodec/escape124.c @@ -362,6 +362,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), @@ -369,5 +370,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 eb6a26e22b..466b2b51df 100644 --- a/libavcodec/escape130.c +++ b/libavcodec/escape130.c @@ -349,6 +349,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), @@ -356,5 +357,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 57a566bb62..0add4ffa57 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -1061,6 +1061,7 @@ static int update_thread_context(AVCodecContext *dst, const AVCodecContext *src) 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), @@ -1071,5 +1072,4 @@ AVCodec ff_ffv1_decoder = { .update_thread_context = ONLY_IF_THREADS_ENABLED(update_thread_context), .capabilities = CODEC_CAP_DR1 /*| CODEC_CAP_DRAW_HORIZ_BAND*/ | CODEC_CAP_FRAME_THREADS | 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 dee0116056..d3eb118ce3 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -1211,6 +1211,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), @@ -1232,7 +1233,6 @@ AVCodec ff_ffv1_encoder = { AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("FFmpeg video codec #1"), .defaults = ffv1_defaults, .priv_class = &ffv1_class, }; diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index c8301a586e..85f5202121 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -591,6 +591,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), @@ -599,7 +600,6 @@ AVCodec ff_flac_decoder = { .decode = flac_decode_frame, .init_thread_copy = ONLY_IF_THREADS_ENABLED(init_thread_copy), .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, - .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 1e9cc48b99..1fc8c4ce6b 100644 --- a/libavcodec/flacenc.c +++ b/libavcodec/flacenc.c @@ -1343,6 +1343,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), @@ -1353,6 +1354,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 f00bf21d47..3d185d5184 100644 --- a/libavcodec/flashsv.c +++ b/libavcodec/flashsv.c @@ -479,6 +479,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), @@ -487,7 +488,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 */ @@ -542,6 +542,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), @@ -550,6 +551,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 e6b181f2ae..ee67652eba 100644 --- a/libavcodec/flashsvenc.c +++ b/libavcodec/flashsvenc.c @@ -277,6 +277,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), @@ -284,5 +285,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 c4bc1a2e24..35b3b6070d 100644 --- a/libavcodec/flicvideo.c +++ b/libavcodec/flicvideo.c @@ -804,6 +804,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), @@ -811,5 +812,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 36e53c5dd0..3e55aaf8c1 100644 --- a/libavcodec/flvdec.c +++ b/libavcodec/flvdec.c @@ -124,6 +124,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), @@ -132,6 +133,5 @@ AVCodec ff_flv_decoder = { .decode = ff_h263_decode_frame, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, .max_lowres = 3, - .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 a68a6fa1dc..9421955b5e 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 60c579db2b..225da11299 100644 --- a/libavcodec/fraps.c +++ b/libavcodec/fraps.c @@ -313,6 +313,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), @@ -320,5 +321,4 @@ AVCodec ff_fraps_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, - .long_name = NULL_IF_CONFIG_SMALL("Fraps"), }; diff --git a/libavcodec/frwu.c b/libavcodec/frwu.c index b1c7408a93..c778dbde1a 100644 --- a/libavcodec/frwu.c +++ b/libavcodec/frwu.c @@ -117,12 +117,12 @@ static const AVClass frwu_class = { AVCodec ff_frwu_decoder = { .name = "frwu", + .long_name = NULL_IF_CONFIG_SMALL("Forward Uncompressed"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_FRWU, .priv_data_size = sizeof(FRWUContext), .init = decode_init, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Forward Uncompressed"), .priv_class = &frwu_class, }; diff --git a/libavcodec/g722dec.c b/libavcodec/g722dec.c index 1a489a71dc..d3b89fffc5 100644 --- a/libavcodec/g722dec.c +++ b/libavcodec/g722dec.c @@ -138,12 +138,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 2fe66f29ce..c4d6c7b853 100644 --- a/libavcodec/g722enc.c +++ b/libavcodec/g722enc.c @@ -381,6 +381,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), @@ -388,7 +389,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 38fbcbda10..368bbaa5e4 100644 --- a/libavcodec/g723_1.c +++ b/libavcodec/g723_1.c @@ -1331,12 +1331,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 d035b3efb1..a16c0efc07 100644 --- a/libavcodec/g726.c +++ b/libavcodec/g726.c @@ -382,6 +382,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), @@ -390,7 +391,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 = &g726_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 bd14c137d2..8b9d95fe09 100644 --- a/libavcodec/gif.c +++ b/libavcodec/gif.c @@ -301,6 +301,7 @@ static const AVClass gif_class = { 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), @@ -311,6 +312,5 @@ 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)"), .priv_class = &gif_class, }; diff --git a/libavcodec/gifdec.c b/libavcodec/gifdec.c index 4c1cb83aa5..4151b88856 100644 --- a/libavcodec/gifdec.c +++ b/libavcodec/gifdec.c @@ -532,6 +532,7 @@ static const AVClass decoder_class = { 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), @@ -539,6 +540,5 @@ 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)"), .priv_class = &decoder_class, }; diff --git a/libavcodec/gsmdec.c b/libavcodec/gsmdec.c index 5de6da4fcb..7ca9677923 100644 --- a/libavcodec/gsmdec.c +++ b/libavcodec/gsmdec.c @@ -111,6 +111,7 @@ static void gsm_flush(AVCodecContext *avctx) #if CONFIG_GSM_DECODER 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), @@ -118,12 +119,12 @@ AVCodec ff_gsm_decoder = { .decode = gsm_decode_frame, .flush = gsm_flush, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("GSM"), }; #endif #if CONFIG_GSM_MS_DECODER 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), @@ -131,6 +132,5 @@ 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"), }; #endif diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 72b3b0991f..50bfec94dd 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -663,6 +663,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), @@ -671,5 +672,4 @@ AVCodec ff_h261_decoder = { .decode = h261_decode_frame, .capabilities = CODEC_CAP_DR1, .max_lowres = 3, - .long_name = NULL_IF_CONFIG_SMALL("H.261"), }; diff --git a/libavcodec/h261enc.c b/libavcodec/h261enc.c index bfa34ea75f..d7f40def8c 100644 --- a/libavcodec/h261enc.c +++ b/libavcodec/h261enc.c @@ -327,6 +327,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), @@ -335,6 +336,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 974acc23c6..4f544f4e09 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -785,6 +785,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), @@ -795,12 +796,12 @@ AVCodec ff_h263_decoder = { CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, .flush = ff_mpeg_flush, .max_lowres = 3, - .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, }; AVCodec ff_h263p_decoder = { .name = "h263p", + .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_H263P, .priv_data_size = sizeof(MpegEncContext), @@ -811,6 +812,5 @@ AVCodec ff_h263p_decoder = { CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, .flush = ff_mpeg_flush, .max_lowres = 3, - .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 cda26d6e6b..5ed303a7bd 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -5184,6 +5184,7 @@ static const AVClass h264_vdpau_class = { 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), @@ -5194,7 +5195,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 e5a9e3bf81..9b904d4c81 100644 --- a/libavcodec/huffyuvdec.c +++ b/libavcodec/huffyuvdec.c @@ -767,6 +767,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), @@ -776,13 +777,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), @@ -792,6 +793,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 5d3fe9a912..c56e281014 100644 --- a/libavcodec/huffyuvenc.c +++ b/libavcodec/huffyuvenc.c @@ -687,6 +687,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), @@ -697,13 +698,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), @@ -714,6 +715,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 3596080056..80c7d07b93 100644 --- a/libavcodec/idcinvideo.c +++ b/libavcodec/idcinvideo.c @@ -243,11 +243,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 ab2f1725fd..6da153ee19 100644 --- a/libavcodec/iff.c +++ b/libavcodec/iff.c @@ -871,6 +871,7 @@ static av_cold int decode_end(AVCodecContext *avctx) #if CONFIG_IFF_ILBM_DECODER AVCodec ff_iff_ilbm_decoder = { .name = "iff", + .long_name = NULL_IF_CONFIG_SMALL("IFF"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_IFF_ILBM, .priv_data_size = sizeof(IffContext), @@ -878,12 +879,12 @@ AVCodec ff_iff_ilbm_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("IFF"), }; #endif #if CONFIG_IFF_BYTERUN1_DECODER AVCodec ff_iff_byterun1_decoder = { .name = "iff", + .long_name = NULL_IF_CONFIG_SMALL("IFF"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_IFF_BYTERUN1, .priv_data_size = sizeof(IffContext), @@ -891,6 +892,5 @@ AVCodec ff_iff_byterun1_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("IFF"), }; #endif diff --git a/libavcodec/imc.c b/libavcodec/imc.c index a72a6dfed1..cbd7041deb 100644 --- a/libavcodec/imc.c +++ b/libavcodec/imc.c @@ -1066,6 +1066,7 @@ static av_cold void flush(AVCodecContext *avctx) #if CONFIG_IMC_DECODER 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), @@ -1074,7 +1075,6 @@ AVCodec ff_imc_decoder = { .decode = imc_decode_frame, .flush = flush, .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 }, }; @@ -1082,6 +1082,7 @@ AVCodec ff_imc_decoder = { #if CONFIG_IAC_DECODER 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), @@ -1090,7 +1091,6 @@ AVCodec ff_iac_decoder = { .decode = imc_decode_frame, .flush = flush, .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 79b844ed0e..d3bbc6d20f 100644 --- a/libavcodec/indeo2.c +++ b/libavcodec/indeo2.c @@ -247,6 +247,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), @@ -254,5 +255,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 7959f91b4f..b8827634e1 100644 --- a/libavcodec/indeo3.c +++ b/libavcodec/indeo3.c @@ -1132,6 +1132,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), @@ -1139,5 +1140,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 de1237f81b..65aa4f5c40 100644 --- a/libavcodec/indeo4.c +++ b/libavcodec/indeo4.c @@ -674,12 +674,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 5e3259aa52..e48cb43407 100644 --- a/libavcodec/indeo5.c +++ b/libavcodec/indeo5.c @@ -676,12 +676,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 ac2695e0f4..e5462e73df 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 4f710b8e38..7ac1456954 100644 --- a/libavcodec/interplayvideo.c +++ b/libavcodec/interplayvideo.c @@ -1016,6 +1016,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), @@ -1023,5 +1024,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 bf1010f574..f793137306 100644 --- a/libavcodec/kgv1dec.c +++ b/libavcodec/kgv1dec.c @@ -176,6 +176,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), @@ -183,6 +184,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 0560c6e114..f879c353e7 100644 --- a/libavcodec/kmvc.c +++ b/libavcodec/kmvc.c @@ -415,11 +415,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 76c3c32e65..0a4d23e7a2 100644 --- a/libavcodec/lagarith.c +++ b/libavcodec/lagarith.c @@ -733,6 +733,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), @@ -740,5 +741,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 ad7ef91e8d..57519ea7d5 100644 --- a/libavcodec/lcldec.c +++ b/libavcodec/lcldec.c @@ -651,6 +651,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), @@ -658,13 +659,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), @@ -672,6 +673,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 07f4d39fce..1dac307dd2 100644 --- a/libavcodec/lclenc.c +++ b/libavcodec/lclenc.c @@ -181,6 +181,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), @@ -188,5 +189,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 f37e03a655..477669a812 100644 --- a/libavcodec/libfaac.c +++ b/libavcodec/libfaac.c @@ -233,6 +233,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), @@ -242,7 +243,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 034701a45d..755b76f958 100644 --- a/libavcodec/libfdk-aacenc.c +++ b/libavcodec/libfdk-aacenc.c @@ -394,6 +394,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), @@ -403,7 +404,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 8250a15140..5107bfeced 100644 --- a/libavcodec/libgsm.c +++ b/libavcodec/libgsm.c @@ -118,6 +118,7 @@ static int libgsm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, #if CONFIG_LIBGSM_ENCODER 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, @@ -125,12 +126,12 @@ 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"), }; #endif #if CONFIG_LIBGSM_MS_ENCODER 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, @@ -138,7 +139,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"), }; #endif @@ -227,6 +227,7 @@ static void libgsm_flush(AVCodecContext *avctx) { #if CONFIG_LIBGSM_DECODER 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), @@ -235,12 +236,12 @@ AVCodec ff_libgsm_decoder = { .decode = libgsm_decode_frame, .flush = libgsm_flush, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"), }; #endif #if CONFIG_LIBGSM_MS_DECODER 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), @@ -249,6 +250,5 @@ 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"), }; #endif diff --git a/libavcodec/libilbc.c b/libavcodec/libilbc.c index b4163c67eb..898fe83b1c 100644 --- a/libavcodec/libilbc.c +++ b/libavcodec/libilbc.c @@ -106,13 +106,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, }; @@ -184,6 +184,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), @@ -191,7 +192,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 95771af1ab..2204f55c12 100644 --- a/libavcodec/libmp3lame.c +++ b/libavcodec/libmp3lame.c @@ -286,6 +286,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), @@ -301,7 +302,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 391ac25ca4..75c467ff59 100644 --- a/libavcodec/libopencore-amr.c +++ b/libavcodec/libopencore-amr.c @@ -128,6 +128,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), @@ -135,7 +136,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 */ @@ -281,6 +281,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), @@ -290,7 +291,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 = &amrnb_class, }; #endif /* CONFIG_LIBOPENCORE_AMRNB_ENCODER */ @@ -366,6 +366,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), @@ -373,7 +374,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 27fb56e03f..734b54faed 100644 --- a/libavcodec/libopenjpegdec.c +++ b/libavcodec/libopenjpegdec.c @@ -405,6 +405,7 @@ static const AVClass openjpeg_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), @@ -412,6 +413,5 @@ AVCodec ff_libopenjpeg_decoder = { .decode = libopenjpeg_decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, .max_lowres = 31, - .long_name = NULL_IF_CONFIG_SMALL("OpenJPEG JPEG 2000"), .priv_class = &openjpeg_class, }; diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c index 059248032c..c7769f7a02 100644 --- a/libavcodec/libopenjpegenc.c +++ b/libavcodec/libopenjpegenc.c @@ -636,6 +636,7 @@ static const AVClass openjpeg_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), @@ -662,6 +663,5 @@ AVCodec ff_libopenjpeg_encoder = { AV_PIX_FMT_XYZ12, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("OpenJPEG JPEG 2000"), .priv_class = &openjpeg_class, }; diff --git a/libavcodec/libopusdec.c b/libavcodec/libopusdec.c index 9b5cfe7b3d..2409de23a0 100644 --- a/libavcodec/libopusdec.c +++ b/libavcodec/libopusdec.c @@ -183,6 +183,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), @@ -191,7 +192,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 6b22b753c5..97d3bba180 100644 --- a/libavcodec/libopusenc.c +++ b/libavcodec/libopusenc.c @@ -428,6 +428,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), @@ -440,7 +441,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 2e0ce5d18c..f20633a29e 100644 --- a/libavcodec/libschroedingerdec.c +++ b/libavcodec/libschroedingerdec.c @@ -374,6 +374,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), @@ -382,5 +383,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 21af65e0df..43530e8536 100644 --- a/libavcodec/libschroedingerenc.c +++ b/libavcodec/libschroedingerenc.c @@ -433,6 +433,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), @@ -443,5 +444,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 213eee4edb..afe1176198 100644 --- a/libavcodec/libspeexdec.c +++ b/libavcodec/libspeexdec.c @@ -180,6 +180,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), @@ -188,5 +189,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 5be5d69af1..aba4618f66 100644 --- a/libavcodec/libspeexenc.c +++ b/libavcodec/libspeexenc.c @@ -349,6 +349,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), @@ -362,7 +363,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 = &speex_class, .defaults = defaults, }; diff --git a/libavcodec/libtheoraenc.c b/libavcodec/libtheoraenc.c index a2e5b74cb6..9fa096fca7 100644 --- a/libavcodec/libtheoraenc.c +++ b/libavcodec/libtheoraenc.c @@ -368,6 +368,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), @@ -378,5 +379,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 4f4cbe7a67..04f9902e91 100644 --- a/libavcodec/libvo-aacenc.c +++ b/libavcodec/libvo-aacenc.c @@ -186,6 +186,7 @@ static const int mpeg4audio_sample_rates[16] = { 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), @@ -196,5 +197,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 f12cfb67a8..4216a415fc 100644 --- a/libavcodec/libvo-amrwbenc.c +++ b/libavcodec/libvo-amrwbenc.c @@ -138,6 +138,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), @@ -146,7 +148,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 = &amrwb_class, }; diff --git a/libavcodec/libvorbisenc.c b/libavcodec/libvorbisenc.c index d7fded813f..a2faac702b 100644 --- a/libavcodec/libvorbisenc.c +++ b/libavcodec/libvorbisenc.c @@ -363,6 +363,7 @@ static int oggvorbis_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, AVCodec ff_libvorbis_encoder = { .name = "libvorbis", + .long_name = NULL_IF_CONFIG_SMALL("libvorbis"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_VORBIS, .priv_data_size = sizeof(OggVorbisEncContext), @@ -372,7 +373,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"), .priv_class = &vorbis_class, .defaults = defaults, }; diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c index be9742812c..de32f402b1 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 5f3c32a598..8ebf0528f8 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -779,6 +779,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), @@ -787,7 +788,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_YUVA420P, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("libvpx VP8"), .priv_class = &class_vp8, .defaults = defaults, }; @@ -808,6 +808,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), @@ -816,7 +817,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 197662d83e..f9b47c9c6f 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -745,6 +745,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), @@ -752,7 +753,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 = &x264_class, .defaults = x264_defaults, .init_static_data = X264_init_static, diff --git a/libavcodec/libxavs.c b/libavcodec/libxavs.c index fad0a54695..f7b99e0bcd 100644 --- a/libavcodec/libxavs.c +++ b/libavcodec/libxavs.c @@ -418,6 +418,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), @@ -426,7 +427,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 = &xavs_class, .defaults = xavs_defaults, }; diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c index 09b07d4b5d..d4c71490e7 100644 --- a/libavcodec/libxvid.c +++ b/libavcodec/libxvid.c @@ -825,6 +825,7 @@ static const AVClass xvid_class = { 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), @@ -832,6 +833,5 @@ 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"), .priv_class = &xvid_class, }; diff --git a/libavcodec/ljpegenc.c b/libavcodec/ljpegenc.c index 76c3cb9e43..af126aab97 100644 --- a/libavcodec/ljpegenc.c +++ b/libavcodec/ljpegenc.c @@ -221,6 +221,7 @@ 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), @@ -232,5 +233,4 @@ AVCodec ff_ljpeg_encoder = { //FIXME avoid MPV_* lossless JPEG should not need t AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("Lossless JPEG"), }; diff --git a/libavcodec/loco.c b/libavcodec/loco.c index 81a93c8215..bf52c49889 100644 --- a/libavcodec/loco.c +++ b/libavcodec/loco.c @@ -302,11 +302,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 c4e98ea4c6..fbd932e203 100644 --- a/libavcodec/mace.c +++ b/libavcodec/mace.c @@ -279,26 +279,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 9211fe70d4..ea47822e28 100644 --- a/libavcodec/mdec.c +++ b/libavcodec/mdec.c @@ -243,6 +243,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), @@ -250,6 +251,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 e2c9369860..a1cb5e7ad3 100644 --- a/libavcodec/mimic.c +++ b/libavcodec/mimic.c @@ -465,6 +465,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), @@ -472,7 +473,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 4327c10d94..f061f0bc26 100644 --- a/libavcodec/mjpegbdec.c +++ b/libavcodec/mjpegbdec.c @@ -155,6 +155,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), @@ -163,5 +164,4 @@ AVCodec ff_mjpegb_decoder = { .decode = mjpegb_decode_frame, .capabilities = CODEC_CAP_DR1, .max_lowres = 3, - .long_name = NULL_IF_CONFIG_SMALL("Apple MJPEG-B"), }; diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 12b75c45c6..5c25a07ac4 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -2078,6 +2078,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), @@ -2087,13 +2088,13 @@ AVCodec ff_mjpeg_decoder = { .flush = decode_flush, .capabilities = CODEC_CAP_DR1, .max_lowres = 3, - .long_name = NULL_IF_CONFIG_SMALL("MJPEG (Motion JPEG)"), .priv_class = &mjpegdec_class, }; #endif #if CONFIG_THP_DECODER 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), @@ -2103,6 +2104,5 @@ AVCodec ff_thp_decoder = { .flush = decode_flush, .capabilities = CODEC_CAP_DR1, .max_lowres = 3, - .long_name = NULL_IF_CONFIG_SMALL("Nintendo Gamecube THP video"), }; #endif diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index bdac2606e6..a208f67862 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -516,6 +516,7 @@ static int amv_encode_picture(AVCodecContext *avctx, AVPacket *pkt, #if CONFIG_MJPEG_ENCODER 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), @@ -526,7 +527,6 @@ AVCodec ff_mjpeg_encoder = { .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("MJPEG (Motion JPEG)"), }; #endif #if CONFIG_AMV_ENCODER diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 961ed621b5..aab82939ab 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -1252,24 +1252,24 @@ error: #if CONFIG_MLP_DECODER 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)"), }; #endif #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 292ebe68b9..800e65c64c 100644 --- a/libavcodec/mmvideo.c +++ b/libavcodec/mmvideo.c @@ -232,6 +232,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), @@ -239,5 +240,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 8f1362f2b3..f8aa08bcb6 100644 --- a/libavcodec/motionpixels.c +++ b/libavcodec/motionpixels.c @@ -338,6 +338,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), @@ -345,5 +346,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 85d4e0901b..86aca63fbc 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 4d6ca896b7..2f58805e18 100644 --- a/libavcodec/mpc8.c +++ b/libavcodec/mpc8.c @@ -435,6 +435,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), @@ -442,7 +443,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 b008708c86..cc8b6c9806 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -2544,6 +2544,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), @@ -2555,12 +2556,12 @@ AVCodec ff_mpeg1video_decoder = { CODEC_CAP_SLICE_THREADS, .flush = flush, .max_lowres = 3, - .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), @@ -2572,7 +2573,6 @@ AVCodec ff_mpeg2video_decoder = { CODEC_CAP_SLICE_THREADS, .flush = flush, .max_lowres = 3, - .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 video"), .profiles = NULL_IF_CONFIG_SMALL(mpeg2_video_profiles), }; @@ -2611,6 +2611,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), @@ -2620,7 +2621,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 e001a12e93..68827895b7 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -1062,6 +1062,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), @@ -1072,12 +1073,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), @@ -1089,6 +1090,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 7fe34cdcbb..d00688a67b 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -2368,6 +2368,7 @@ static const AVClass mpeg4_vdpau_class = { 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), @@ -2379,7 +2380,6 @@ AVCodec ff_mpeg4_decoder = { CODEC_CAP_FRAME_THREADS, .flush = ff_mpeg_flush, .max_lowres = 3, - .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 8454edd0dc..db05b4b4b3 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -1353,6 +1353,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), @@ -1361,6 +1362,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 4c6376b4a2..fc900d855b 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec.c @@ -1999,6 +1999,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), @@ -2006,7 +2007,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 }, @@ -2015,6 +2015,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), @@ -2022,7 +2023,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 }, @@ -2031,6 +2031,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), @@ -2038,7 +2039,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 }, @@ -2047,6 +2047,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), @@ -2054,7 +2055,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 }, @@ -2063,6 +2063,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), @@ -2071,7 +2072,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 17a7757f95..61b332ed50 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 3a109f09dc..63c8460c32 100644 --- a/libavcodec/mpegaudioenc.c +++ b/libavcodec/mpegaudioenc.c @@ -770,6 +770,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), @@ -783,6 +784,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 7b69acaa97..655cc592f9 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -4225,6 +4225,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), @@ -4232,7 +4233,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, }; @@ -4253,6 +4253,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), @@ -4261,7 +4262,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, }; @@ -4269,6 +4269,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), @@ -4276,7 +4277,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, }; @@ -4284,6 +4284,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), @@ -4291,7 +4292,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, }; @@ -4299,6 +4299,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), @@ -4306,6 +4307,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 768b52059f..7c260fe50e 100644 --- a/libavcodec/msmpeg4dec.c +++ b/libavcodec/msmpeg4dec.c @@ -909,6 +909,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), @@ -917,12 +918,12 @@ AVCodec ff_msmpeg4v1_decoder = { .decode = ff_h263_decode_frame, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, .max_lowres = 3, - .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), @@ -931,12 +932,12 @@ AVCodec ff_msmpeg4v2_decoder = { .decode = ff_h263_decode_frame, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, .max_lowres = 3, - .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), @@ -945,12 +946,12 @@ AVCodec ff_msmpeg4v3_decoder = { .decode = ff_h263_decode_frame, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, .max_lowres = 3, - .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), @@ -959,6 +960,5 @@ AVCodec ff_wmv1_decoder = { .decode = ff_h263_decode_frame, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, .max_lowres = 3, - .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 674e586ac2..2b4ab1a6a5 100644 --- a/libavcodec/msrle.c +++ b/libavcodec/msrle.c @@ -153,6 +153,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), @@ -160,5 +161,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 bb1858dbb8..46ea2b55d6 100644 --- a/libavcodec/mss1.c +++ b/libavcodec/mss1.c @@ -213,6 +213,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), @@ -220,5 +221,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 12336547b0..fcb50e3f09 100644 --- a/libavcodec/mss2.c +++ b/libavcodec/mss2.c @@ -842,6 +842,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), @@ -849,5 +850,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 15bf77a5b1..a3aec80c2d 100644 --- a/libavcodec/mss3.c +++ b/libavcodec/mss3.c @@ -859,6 +859,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), @@ -866,5 +867,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 c518fda3ae..fd1f316bbf 100644 --- a/libavcodec/mss4.c +++ b/libavcodec/mss4.c @@ -671,6 +671,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), @@ -678,5 +679,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 c5a1daae81..83c50ac46d 100644 --- a/libavcodec/msvideo1.c +++ b/libavcodec/msvideo1.c @@ -335,6 +335,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), @@ -342,5 +343,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 42110a2c0f..ef16fd6fa2 100644 --- a/libavcodec/nellymoserdec.c +++ b/libavcodec/nellymoserdec.c @@ -196,6 +196,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), @@ -203,7 +204,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 b35820a3f8..f9d1389a78 100644 --- a/libavcodec/nellymoserenc.c +++ b/libavcodec/nellymoserenc.c @@ -404,6 +404,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), @@ -411,7 +412,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 85172e964f..bfbf802777 100644 --- a/libavcodec/nuv.c +++ b/libavcodec/nuv.c @@ -338,6 +338,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), @@ -345,5 +346,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 2c4c9e0927..2421464204 100644 --- a/libavcodec/pamenc.c +++ b/libavcodec/pamenc.c @@ -126,6 +126,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), @@ -133,5 +134,4 @@ AVCodec ff_pam_encoder = { .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA, AV_PIX_FMT_RGB48BE, AV_PIX_FMT_RGBA64BE, AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY8A, AV_PIX_FMT_GRAY16BE, AV_PIX_FMT_MONOBLACK, 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 db458d0c1c..695bc31753 100644 --- a/libavcodec/pcm-bluray.c +++ b/libavcodec/pcm-bluray.c @@ -303,6 +303,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, @@ -310,5 +311,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 b868fed77d..0a4ad0b9d9 100644 --- a/libavcodec/pcm.c +++ b/libavcodec/pcm.c @@ -496,6 +496,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, \ @@ -503,7 +504,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) \ @@ -517,6 +517,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), \ @@ -525,7 +526,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 835dcfeb0a..66b1a35fdf 100644 --- a/libavcodec/pcx.c +++ b/libavcodec/pcx.c @@ -236,9 +236,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 1b96d8450f..fa45888466 100644 --- a/libavcodec/pcxenc.c +++ b/libavcodec/pcxenc.c @@ -198,6 +198,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, .encode2 = pcx_encode_frame, @@ -208,5 +209,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 a981c0ed50..4de83f3cd0 100644 --- a/libavcodec/pgssubdec.c +++ b/libavcodec/pgssubdec.c @@ -538,12 +538,12 @@ static const AVClass pgsdec_class = { 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"), .priv_class = &pgsdec_class, }; diff --git a/libavcodec/pictordec.c b/libavcodec/pictordec.c index 0bf4fcd552..5b528f5e8a 100644 --- a/libavcodec/pictordec.c +++ b/libavcodec/pictordec.c @@ -256,10 +256,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 c37f73d776..3d21e50288 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -927,6 +927,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), @@ -936,5 +937,4 @@ AVCodec ff_png_decoder = { .init_thread_copy = ONLY_IF_THREADS_ENABLED(png_dec_init), .update_thread_context = ONLY_IF_THREADS_ENABLED(update_thread_context), .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS /*| 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 f7f4752ca8..58acc3c409 100644 --- a/libavcodec/pngenc.c +++ b/libavcodec/pngenc.c @@ -489,6 +489,7 @@ static const AVClass pngenc_class = { 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), @@ -503,6 +504,5 @@ 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"), .priv_class = &pngenc_class, }; diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c index 1e00723e0d..c84b6eb080 100644 --- a/libavcodec/pnmdec.c +++ b/libavcodec/pnmdec.c @@ -253,59 +253,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 a3e1c78328..9b2824a104 100644 --- a/libavcodec/pnmenc.c +++ b/libavcodec/pnmenc.c @@ -124,6 +124,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), @@ -131,13 +132,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), @@ -145,13 +146,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), @@ -159,19 +160,18 @@ 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), .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_lgpl.c b/libavcodec/proresdec_lgpl.c index 04aeb16ab5..8abff30f44 100644 --- a/libavcodec/proresdec_lgpl.c +++ b/libavcodec/proresdec_lgpl.c @@ -755,6 +755,7 @@ static av_cold int decode_close(AVCodecContext *avctx) AVCodec ff_prores_lgpl_decoder = { .name = "prores_lgpl", + .long_name = NULL_IF_CONFIG_SMALL("Apple ProRes (iCodec Pro)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PRORES, .priv_data_size = sizeof(ProresContext), @@ -762,5 +763,4 @@ AVCodec ff_prores_lgpl_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_kostya.c b/libavcodec/proresenc_kostya.c index d5400b4e92..510b4084e2 100644 --- a/libavcodec/proresenc_kostya.c +++ b/libavcodec/proresenc_kostya.c @@ -1260,6 +1260,7 @@ static const AVClass proresenc_class = { AVCodec ff_prores_ks_encoder = { .name = "prores_ks", + .long_name = NULL_IF_CONFIG_SMALL("Apple ProRes (iCodec Pro)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PRORES, .priv_data_size = sizeof(ProresContext), @@ -1267,7 +1268,6 @@ AVCodec ff_prores_ks_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 37135c55dd..6da9f0250c 100644 --- a/libavcodec/ptx.c +++ b/libavcodec/ptx.c @@ -85,9 +85,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 607704df8c..9650711e00 100644 --- a/libavcodec/qcelpdec.c +++ b/libavcodec/qcelpdec.c @@ -785,11 +785,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 3d5ff3316d..0a9eea057a 100644 --- a/libavcodec/qdm2.c +++ b/libavcodec/qdm2.c @@ -2039,6 +2039,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), @@ -2047,5 +2048,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 69700999fb..3f82e5bd4c 100644 --- a/libavcodec/qdrw.c +++ b/libavcodec/qdrw.c @@ -142,10 +142,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 f936338e4d..edde937b15 100644 --- a/libavcodec/qpeg.c +++ b/libavcodec/qpeg.c @@ -340,6 +340,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), @@ -348,5 +349,4 @@ AVCodec ff_qpeg_decoder = { .decode = decode_frame, .flush = decode_flush, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Q-team QPEG"), }; diff --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c index a22d776660..4eeeea4fb3 100644 --- a/libavcodec/qtrle.c +++ b/libavcodec/qtrle.c @@ -516,6 +516,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), @@ -523,5 +524,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 a25c45d6db..2395cffb0d 100644 --- a/libavcodec/qtrleenc.c +++ b/libavcodec/qtrleenc.c @@ -389,6 +389,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), @@ -398,5 +399,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_GRAY8, 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 198914c749..dda4372f70 100644 --- a/libavcodec/r210dec.c +++ b/libavcodec/r210dec.c @@ -90,23 +90,23 @@ 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 #if CONFIG_AVRP_DECODER diff --git a/libavcodec/ra144dec.c b/libavcodec/ra144dec.c index 0492d1fb08..b7add7f365 100644 --- a/libavcodec/ra144dec.c +++ b/libavcodec/ra144dec.c @@ -127,11 +127,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 cef7f6dbdc..3558254e56 100644 --- a/libavcodec/ra144enc.c +++ b/libavcodec/ra144enc.c @@ -544,6 +544,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,6 +555,5 @@ AVCodec ff_ra_144_encoder = { .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, .supported_samplerates = (const int[]){ 8000, 0 }, - .long_name = NULL_IF_CONFIG_SMALL("RealAudio 1.0 (14.4K)"), .channel_layouts = (const uint64_t[]) { AV_CH_LAYOUT_MONO, 0 }, }; diff --git a/libavcodec/ra288.c b/libavcodec/ra288.c index 1f65710a42..c1b9b6bedd 100644 --- a/libavcodec/ra288.c +++ b/libavcodec/ra288.c @@ -229,11 +229,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 cc7501ed83..8a319ac824 100644 --- a/libavcodec/ralf.c +++ b/libavcodec/ralf.c @@ -522,6 +522,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), @@ -530,7 +531,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 54ed52df0f..dd47f532fd 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -349,12 +349,12 @@ 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"), .priv_class = &rawdec_class, }; diff --git a/libavcodec/rawenc.c b/libavcodec/rawenc.c index c6da6b8d89..036261d1ec 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 c8853de22e..6e63ed148f 100644 --- a/libavcodec/rl2.c +++ b/libavcodec/rl2.c @@ -215,6 +215,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), @@ -222,5 +223,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 b68e3f8cb0..b0b76d0883 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 85fdab7edb..8e7dffe5cc 100644 --- a/libavcodec/roqvideodec.c +++ b/libavcodec/roqvideodec.c @@ -236,6 +236,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), @@ -243,5 +244,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 666c49df13..bf0756cbe3 100644 --- a/libavcodec/roqvideoenc.c +++ b/libavcodec/roqvideoenc.c @@ -1075,6 +1075,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), @@ -1084,5 +1085,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 0bcec35ac4..4917369de0 100644 --- a/libavcodec/rpza.c +++ b/libavcodec/rpza.c @@ -281,6 +281,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), @@ -288,5 +289,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 0f88ad212a..5206533633 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -757,6 +757,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), @@ -765,12 +766,12 @@ AVCodec ff_rv10_decoder = { .decode = rv10_decode_frame, .capabilities = CODEC_CAP_DR1, .max_lowres = 3, - .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), @@ -780,6 +781,5 @@ AVCodec ff_rv20_decoder = { .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY, .flush = ff_mpeg_flush, .max_lowres = 3, - .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 c4c5c53850..1f85743b7b 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 295699a43a..b9431166c7 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 3292ad010b..7690da70cd 100644 --- a/libavcodec/rv30.c +++ b/libavcodec/rv30.c @@ -274,6 +274,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), @@ -283,7 +284,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 e88f61942a..17a2f91728 100644 --- a/libavcodec/rv40.c +++ b/libavcodec/rv40.c @@ -565,6 +565,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), @@ -574,7 +575,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 56aea75aaa..7639a0f1c9 100644 --- a/libavcodec/s302m.c +++ b/libavcodec/s302m.c @@ -153,9 +153,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 3ce5994d9b..df41e89853 100644 --- a/libavcodec/sgidec.c +++ b/libavcodec/sgidec.c @@ -234,10 +234,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 973514c30b..48532ff3e1 100644 --- a/libavcodec/sgienc.c +++ b/libavcodec/sgienc.c @@ -201,6 +201,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, .init = encode_init, @@ -212,5 +213,4 @@ AVCodec ff_sgi_encoder = { AV_PIX_FMT_GRAY16LE, AV_PIX_FMT_GRAY16BE, 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 5cb21c541b..920cb7d1e9 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -661,6 +661,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), @@ -668,7 +669,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_U8P, AV_SAMPLE_FMT_NONE }, diff --git a/libavcodec/sipr.c b/libavcodec/sipr.c index d524177021..17260a05d3 100644 --- a/libavcodec/sipr.c +++ b/libavcodec/sipr.c @@ -564,11 +564,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 6b80826a19..3cdb0d58b3 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -807,6 +807,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), @@ -814,15 +815,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 2c7ab9ab69..3b836e7c7a 100644 --- a/libavcodec/smc.c +++ b/libavcodec/smc.c @@ -463,6 +463,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), @@ -470,5 +471,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 b083015f00..81f3c24a09 100644 --- a/libavcodec/sp5xdec.c +++ b/libavcodec/sp5xdec.c @@ -96,6 +96,7 @@ static int sp5x_decode_frame(AVCodecContext *avctx, #if CONFIG_SP5X_DECODER 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), @@ -104,18 +105,17 @@ AVCodec ff_sp5x_decoder = { .decode = sp5x_decode_frame, .capabilities = CODEC_CAP_DR1, .max_lowres = 3, - .long_name = NULL_IF_CONFIG_SMALL("Sunplus JPEG (SP5X)"), }; #endif #if CONFIG_AMV_DECODER 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"), }; #endif diff --git a/libavcodec/sunrast.c b/libavcodec/sunrast.c index 1e25b6011f..a373df7d35 100644 --- a/libavcodec/sunrast.c +++ b/libavcodec/sunrast.c @@ -209,9 +209,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 23c5673edf..0879ce62cb 100644 --- a/libavcodec/sunrastenc.c +++ b/libavcodec/sunrastenc.c @@ -205,6 +205,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), @@ -216,5 +217,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 e768d81868..5193798ea4 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 5b4748f319..a6c94ad006 100644 --- a/libavcodec/svq1enc.c +++ b/libavcodec/svq1enc.c @@ -623,6 +623,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), @@ -631,5 +632,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 6988a1dd74..89bb616797 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -1347,6 +1347,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), @@ -1356,7 +1357,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 0edfddd7da..1017032703 100644 --- a/libavcodec/takdec.c +++ b/libavcodec/takdec.c @@ -931,6 +931,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), @@ -940,7 +941,6 @@ AVCodec ff_tak_decoder = { .init_thread_copy = ONLY_IF_THREADS_ENABLED(init_thread_copy), .update_thread_context = ONLY_IF_THREADS_ENABLED(update_thread_context), .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, - .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 2e51d80b3e..b3616c29d7 100644 --- a/libavcodec/targa.c +++ b/libavcodec/targa.c @@ -299,10 +299,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 da7450301d..108e1485e4 100644 --- a/libavcodec/targaenc.c +++ b/libavcodec/targaenc.c @@ -172,6 +172,7 @@ static int targa_encode_frame(AVCodecContext *avctx, AVPacket *pkt, AVCodec ff_targa_encoder = { .name = "targa", + .long_name = NULL_IF_CONFIG_SMALL("Truevision Targa image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_TARGA, .encode2 = targa_encode_frame, @@ -179,5 +180,4 @@ AVCodec ff_targa_encoder = { AV_PIX_FMT_BGR24, AV_PIX_FMT_BGRA, AV_PIX_FMT_RGB555LE, AV_PIX_FMT_GRAY8, AV_PIX_FMT_PAL8, AV_PIX_FMT_NONE }, - .long_name= NULL_IF_CONFIG_SMALL("Truevision Targa image"), }; diff --git a/libavcodec/tiertexseqv.c b/libavcodec/tiertexseqv.c index f892e4dac9..0da9afdaa3 100644 --- a/libavcodec/tiertexseqv.c +++ b/libavcodec/tiertexseqv.c @@ -256,6 +256,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), @@ -263,5 +264,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 279298c2b3..e525a735f6 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 7e94deba7e..d72cee8aea 100644 --- a/libavcodec/truemotion1.c +++ b/libavcodec/truemotion1.c @@ -902,6 +902,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), @@ -909,5 +910,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 840b993d0d..42badcbf8e 100644 --- a/libavcodec/truemotion2.c +++ b/libavcodec/truemotion2.c @@ -1009,6 +1009,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), @@ -1016,5 +1017,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 2eb218c4bc..d3e3b20e91 100644 --- a/libavcodec/truespeech.c +++ b/libavcodec/truespeech.c @@ -356,11 +356,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 6e1e077471..b4931ec1ff 100644 --- a/libavcodec/tscc.c +++ b/libavcodec/tscc.c @@ -179,6 +179,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), @@ -186,5 +187,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 291693af3d..9bcfa38dda 100644 --- a/libavcodec/tscc2.c +++ b/libavcodec/tscc2.c @@ -373,6 +373,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), @@ -380,5 +381,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 b5ddec4f47..6ba3235392 100644 --- a/libavcodec/tta.c +++ b/libavcodec/tta.c @@ -442,6 +442,7 @@ static const AVClass tta_decoder_class = { 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), @@ -450,6 +451,5 @@ AVCodec ff_tta_decoder = { .decode = tta_decode_frame, .init_thread_copy = ONLY_IF_THREADS_ENABLED(init_thread_copy), .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, - .long_name = NULL_IF_CONFIG_SMALL("TTA (True Audio)"), .priv_class = &tta_decoder_class, }; diff --git a/libavcodec/twinvqdec.c b/libavcodec/twinvqdec.c index c072596279..067df56d73 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 e8d483f0ee..7526f1377c 100644 --- a/libavcodec/txd.c +++ b/libavcodec/txd.c @@ -134,9 +134,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 2120d97aae..aee713fe1d 100644 --- a/libavcodec/ulti.c +++ b/libavcodec/ulti.c @@ -418,6 +418,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), @@ -425,5 +426,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 241431cc31..e3ef22d2a2 100644 --- a/libavcodec/utvideodec.c +++ b/libavcodec/utvideodec.c @@ -544,6 +544,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), @@ -551,5 +552,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 3e4c714291..c4885a59b1 100644 --- a/libavcodec/utvideoenc.c +++ b/libavcodec/utvideoenc.c @@ -596,6 +596,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), @@ -606,5 +607,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 c6dba23bd4..ae0395254e 100644 --- a/libavcodec/v210dec.c +++ b/libavcodec/v210dec.c @@ -174,12 +174,12 @@ static const AVClass v210dec_class = { 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, .priv_data_size = sizeof(V210DecContext), .init = decode_init, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), .priv_class = &v210dec_class, }; diff --git a/libavcodec/v210enc.c b/libavcodec/v210enc.c index 5527686046..51ec6ef57e 100644 --- a/libavcodec/v210enc.c +++ b/libavcodec/v210enc.c @@ -116,11 +116,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 e4d5460eff..6330715793 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 f8229e20f3..e7a9c0e109 100644 --- a/libavcodec/v410dec.c +++ b/libavcodec/v410dec.c @@ -89,10 +89,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 9661c7c8ea..c4ce3dfd04 100644 --- a/libavcodec/v410enc.c +++ b/libavcodec/v410enc.c @@ -88,11 +88,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 29cd10432d..3c89a2986e 100644 --- a/libavcodec/vb.c +++ b/libavcodec/vb.c @@ -266,12 +266,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 cbb2ffc54e..a8c71ed9c9 100644 --- a/libavcodec/vble.c +++ b/libavcodec/vble.c @@ -202,6 +202,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), @@ -209,5 +210,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 399e0d2264..74a1a6cf48 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -6245,6 +6245,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), @@ -6253,7 +6254,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) }; @@ -6261,6 +6261,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), @@ -6269,7 +6270,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) }; @@ -6310,6 +6310,7 @@ AVCodec ff_vc1_vdpau_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), @@ -6318,7 +6319,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 @@ -6326,6 +6326,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), @@ -6334,7 +6335,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 aa73da8278..c1393b558f 100644 --- a/libavcodec/vcr1.c +++ b/libavcodec/vcr1.c @@ -123,11 +123,11 @@ static int vcr1_decode_frame(AVCodecContext *avctx, void *data, 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 fcb8a9b026..ea0e8428d2 100644 --- a/libavcodec/vmdav.c +++ b/libavcodec/vmdav.c @@ -655,6 +655,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), @@ -662,16 +663,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 9fe99408a4..787c381699 100644 --- a/libavcodec/vmnc.c +++ b/libavcodec/vmnc.c @@ -525,6 +525,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), @@ -532,5 +533,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 c5950e66a4..a2f7dd27f8 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -1817,6 +1817,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), @@ -1825,7 +1826,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 1af76d4811..9ef629681e 100644 --- a/libavcodec/vorbisenc.c +++ b/libavcodec/vorbisenc.c @@ -1192,6 +1192,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), @@ -1201,5 +1202,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 e2e5ab9697..12fe3abc35 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2462,6 +2462,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), @@ -2471,7 +2472,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) }; @@ -2479,6 +2479,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), @@ -2488,7 +2489,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 4eecbe3a87..2ab90b7b5b 100644 --- a/libavcodec/vp5.c +++ b/libavcodec/vp5.c @@ -280,6 +280,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), @@ -287,5 +288,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 1a06359c61..79b9cfebef 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -658,6 +658,7 @@ static av_cold void vp6_decode_free_context(VP56Context *s) 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), @@ -665,12 +666,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), @@ -678,12 +679,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), @@ -691,5 +692,4 @@ AVCodec ff_vp6a_decoder = { .close = vp6_decode_free, .decode = ff_vp56_decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_SLICE_THREADS, - .long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version, with alpha channel)"), }; diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 157cebcb1a..7387c3f791 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -2154,6 +2154,7 @@ static int webp_decode_frame(AVCodecContext *avctx, void *data, int *data_size, 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), @@ -2162,7 +2163,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 0a2b668d29..911e71339c 100644 --- a/libavcodec/vqavideo.c +++ b/libavcodec/vqavideo.c @@ -635,6 +635,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), @@ -642,5 +643,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 ac03c16c6a..203cd28f6d 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -1080,6 +1080,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), @@ -1089,5 +1090,4 @@ AVCodec ff_wavpack_decoder = { .flush = wavpack_decode_flush, .init_thread_copy = ONLY_IF_THREADS_ENABLED(init_thread_copy), .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, - .long_name = NULL_IF_CONFIG_SMALL("WavPack"), }; diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index 8fc0cca807..e6a0b04779 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -948,6 +948,7 @@ static av_cold void flush(AVCodecContext *avctx) #if CONFIG_WMAV1_DECODER 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), @@ -956,7 +957,6 @@ 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 }, }; @@ -964,6 +964,7 @@ AVCodec ff_wmav1_decoder = { #if CONFIG_WMAV2_DECODER 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), @@ -972,7 +973,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 1ca733bc3a..895a1805cc 100644 --- a/libavcodec/wmaenc.c +++ b/libavcodec/wmaenc.c @@ -401,6 +401,7 @@ static int encode_superframe(AVCodecContext *avctx, AVPacket *avpkt, #if CONFIG_WMAV1_ENCODER 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), @@ -409,12 +410,12 @@ 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"), }; #endif #if CONFIG_WMAV2_ENCODER 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), @@ -423,6 +424,5 @@ 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"), }; #endif diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c index ab764ed8d8..21b4f91bd2 100644 --- a/libavcodec/wmalosslessdec.c +++ b/libavcodec/wmalosslessdec.c @@ -1304,6 +1304,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), @@ -1312,7 +1313,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 99b18eb7ae..6de6fcdc1d 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -1648,6 +1648,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), @@ -1656,7 +1657,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 c0fd8233a4..c2737abd47 100644 --- a/libavcodec/wmavoice.c +++ b/libavcodec/wmavoice.c @@ -2062,6 +2062,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), @@ -2071,5 +2072,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 099cc36e5d..4f2a5e996d 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -468,6 +468,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), @@ -475,6 +476,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 23b64a76a2..ab5e08591d 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 e7c92e803e..d8532e4b16 100644 --- a/libavcodec/wnv1.c +++ b/libavcodec/wnv1.c @@ -146,11 +146,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 d27df75ae7..6929cbf5e5 100644 --- a/libavcodec/ws-snd1.c +++ b/libavcodec/ws-snd1.c @@ -172,10 +172,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 50773810e1..1c2e97cda2 100644 --- a/libavcodec/xan.c +++ b/libavcodec/xan.c @@ -639,6 +639,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), @@ -646,5 +647,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 e7cec1d069..a752bdf2a7 100644 --- a/libavcodec/xbmenc.c +++ b/libavcodec/xbmenc.c @@ -57,10 +57,10 @@ static int xbm_encode_frame(AVCodecContext *avctx, AVPacket *pkt, 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, .encode2 = xbm_encode_frame, .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 ff62a0f62b..2d1da1d255 100644 --- a/libavcodec/xl.c +++ b/libavcodec/xl.c @@ -129,10 +129,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 d3367b0d6e..174d74ed81 100644 --- a/libavcodec/xsubdec.c +++ b/libavcodec/xsubdec.c @@ -137,9 +137,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 a644edfc9b..9dc80ee4af 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 66a2fe9b0c..6d952be3b4 100644 --- a/libavcodec/xwddec.c +++ b/libavcodec/xwddec.c @@ -239,9 +239,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 4b4f368216..06fa4a0a97 100644 --- a/libavcodec/xwdenc.c +++ b/libavcodec/xwdenc.c @@ -210,6 +210,7 @@ static int xwd_encode_frame(AVCodecContext *avctx, AVPacket *pkt, 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, .encode2 = xwd_encode_frame, @@ -235,5 +236,4 @@ AVCodec ff_xwd_encoder = { AV_PIX_FMT_GRAY8, 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 4030889bd2..56d5f4961d 100644 --- a/libavcodec/xxan.c +++ b/libavcodec/xxan.c @@ -442,6 +442,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), @@ -449,5 +450,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 6315add0c9..c6b19ec795 100644 --- a/libavcodec/yop.c +++ b/libavcodec/yop.c @@ -265,11 +265,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, .close = yop_decode_close, .decode = yop_decode_frame, - .long_name = NULL_IF_CONFIG_SMALL("Psygnosis YOP Video"), }; diff --git a/libavcodec/zerocodec.c b/libavcodec/zerocodec.c index 4a23b67834..80264b34d6 100644 --- a/libavcodec/zerocodec.c +++ b/libavcodec/zerocodec.c @@ -136,11 +136,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 89857af45d..71e828771a 100644 --- a/libavcodec/zmbv.c +++ b/libavcodec/zmbv.c @@ -622,6 +622,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), @@ -629,5 +630,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 b634e5a99e..2907c99abc 100644 --- a/libavcodec/zmbvenc.c +++ b/libavcodec/zmbvenc.c @@ -332,6 +332,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), @@ -339,5 +340,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"), }; |