diff options
60 files changed, 82 insertions, 83 deletions
diff --git a/libavcodec/012v.c b/libavcodec/012v.c index f694769..c2b6a35 100644 --- a/libavcodec/012v.c +++ b/libavcodec/012v.c @@ -150,10 +150,10 @@ static int zero12v_decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_zero12v_decoder = { .name = "012v", + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_012V, .init = zero12v_decode_init, .decode = zero12v_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), }; diff --git a/libavcodec/avrndec.c b/libavcodec/avrndec.c index 40aca17..7a50a5c 100644 --- a/libavcodec/avrndec.c +++ b/libavcodec/avrndec.c @@ -119,14 +119,13 @@ static int decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_avrn_decoder = { .name = "avrn", + .long_name = NULL_IF_CONFIG_SMALL("Avid AVI Codec"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_AVRN, .priv_data_size = sizeof(AVRnContext), .init = init, .close = end, .decode = decode_frame, - .long_name = NULL_IF_CONFIG_SMALL("Avid AVI Codec"), .capabilities = CODEC_CAP_DR1, .max_lowres = 3, }; - diff --git a/libavcodec/avuidec.c b/libavcodec/avuidec.c index a574f5b..7fb644c 100644 --- a/libavcodec/avuidec.c +++ b/libavcodec/avuidec.c @@ -121,10 +121,10 @@ static int avui_decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_avui_decoder = { .name = "avui", + .long_name = NULL_IF_CONFIG_SMALL("Avid Meridien Uncompressed"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_AVUI, .init = avui_decode_init, .decode = avui_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Avid Meridien Uncompressed"), }; diff --git a/libavcodec/avuienc.c b/libavcodec/avuienc.c index a4970a0..9276935 100644 --- a/libavcodec/avuienc.c +++ b/libavcodec/avuienc.c @@ -101,6 +101,7 @@ static av_cold int avui_encode_close(AVCodecContext *avctx) AVCodec ff_avui_encoder = { .name = "avui", + .long_name = NULL_IF_CONFIG_SMALL("Avid Meridien Uncompressed"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_AVUI, .init = avui_encode_init, @@ -108,5 +109,4 @@ AVCodec ff_avui_encoder = { .close = avui_encode_close, .capabilities = CODEC_CAP_EXPERIMENTAL, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_UYVY422, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Avid Meridien Uncompressed"), }; diff --git a/libavcodec/bintext.c b/libavcodec/bintext.c index f8059aa..97fceb1 100644 --- a/libavcodec/bintext.c +++ b/libavcodec/bintext.c @@ -220,6 +220,7 @@ static av_cold int decode_end(AVCodecContext *avctx) #if CONFIG_BINTEXT_DECODER AVCodec ff_bintext_decoder = { .name = "bintext", + .long_name = NULL_IF_CONFIG_SMALL("Binary text"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_BINTEXT, .priv_data_size = sizeof(XbinContext), @@ -227,12 +228,12 @@ AVCodec ff_bintext_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Binary text"), }; #endif #if CONFIG_XBIN_DECODER AVCodec ff_xbin_decoder = { .name = "xbin", + .long_name = NULL_IF_CONFIG_SMALL("eXtended BINary text"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_XBIN, .priv_data_size = sizeof(XbinContext), @@ -240,12 +241,12 @@ AVCodec ff_xbin_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("eXtended BINary text"), }; #endif #if CONFIG_IDF_DECODER AVCodec ff_idf_decoder = { .name = "idf", + .long_name = NULL_IF_CONFIG_SMALL("iCEDraw text"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_IDF, .priv_data_size = sizeof(XbinContext), @@ -253,6 +254,5 @@ AVCodec ff_idf_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("iCEDraw text"), }; #endif diff --git a/libavcodec/brender_pix.c b/libavcodec/brender_pix.c index b30b882..e1f5d48 100644 --- a/libavcodec/brender_pix.c +++ b/libavcodec/brender_pix.c @@ -211,9 +211,9 @@ static int brpix_decode_frame(AVCodecContext *avctx, AVCodec ff_brender_pix_decoder = { .name = "brender_pix", + .long_name = NULL_IF_CONFIG_SMALL("BRender PIX image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_BRENDER_PIX, .decode = brpix_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("BRender PIX image"), }; diff --git a/libavcodec/cpia.c b/libavcodec/cpia.c index 4f83503..44226fb 100644 --- a/libavcodec/cpia.c +++ b/libavcodec/cpia.c @@ -222,6 +222,7 @@ static av_cold int cpia_decode_end(AVCodecContext *avctx) AVCodec ff_cpia_decoder = { .name = "cpia", + .long_name = NULL_IF_CONFIG_SMALL("CPiA video format"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_CPIA, .priv_data_size = sizeof(CpiaContext), @@ -229,5 +230,4 @@ AVCodec ff_cpia_decoder = { .close = cpia_decode_end, .decode = cpia_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("CPiA video format"), }; diff --git a/libavcodec/crystalhd.c b/libavcodec/crystalhd.c index 5dee825..94f8c85 100644 --- a/libavcodec/crystalhd.c +++ b/libavcodec/crystalhd.c @@ -1088,6 +1088,7 @@ static AVClass h264_class = { AVCodec ff_h264_crystalhd_decoder = { .name = "h264_crystalhd", + .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 (CrystalHD acceleration)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_H264, .priv_data_size = sizeof(CHDContext), @@ -1096,7 +1097,6 @@ AVCodec ff_h264_crystalhd_decoder = { .decode = decode, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY, .flush = flush, - .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 (CrystalHD acceleration)"), .pix_fmts = (const enum AVPixelFormat[]){AV_PIX_FMT_YUYV422, AV_PIX_FMT_NONE}, .priv_class = &h264_class, }; @@ -1112,6 +1112,7 @@ static AVClass mpeg2_class = { AVCodec ff_mpeg2_crystalhd_decoder = { .name = "mpeg2_crystalhd", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 Video (CrystalHD acceleration)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MPEG2VIDEO, .priv_data_size = sizeof(CHDContext), @@ -1120,7 +1121,6 @@ AVCodec ff_mpeg2_crystalhd_decoder = { .decode = decode, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY, .flush = flush, - .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 Video (CrystalHD acceleration)"), .pix_fmts = (const enum AVPixelFormat[]){AV_PIX_FMT_YUYV422, AV_PIX_FMT_NONE}, .priv_class = &mpeg2_class, }; @@ -1136,6 +1136,7 @@ static AVClass mpeg4_class = { AVCodec ff_mpeg4_crystalhd_decoder = { .name = "mpeg4_crystalhd", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 Part 2 (CrystalHD acceleration)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MPEG4, .priv_data_size = sizeof(CHDContext), @@ -1144,7 +1145,6 @@ AVCodec ff_mpeg4_crystalhd_decoder = { .decode = decode, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY, .flush = flush, - .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 Part 2 (CrystalHD acceleration)"), .pix_fmts = (const enum AVPixelFormat[]){AV_PIX_FMT_YUYV422, AV_PIX_FMT_NONE}, .priv_class = &mpeg4_class, }; @@ -1160,6 +1160,7 @@ static AVClass msmpeg4_class = { AVCodec ff_msmpeg4_crystalhd_decoder = { .name = "msmpeg4_crystalhd", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 Part 2 Microsoft variant version 3 (CrystalHD acceleration)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MSMPEG4V3, .priv_data_size = sizeof(CHDContext), @@ -1168,7 +1169,6 @@ AVCodec ff_msmpeg4_crystalhd_decoder = { .decode = decode, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_EXPERIMENTAL, .flush = flush, - .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 Part 2 Microsoft variant version 3 (CrystalHD acceleration)"), .pix_fmts = (const enum AVPixelFormat[]){AV_PIX_FMT_YUYV422, AV_PIX_FMT_NONE}, .priv_class = &msmpeg4_class, }; @@ -1184,6 +1184,7 @@ static AVClass vc1_class = { AVCodec ff_vc1_crystalhd_decoder = { .name = "vc1_crystalhd", + .long_name = NULL_IF_CONFIG_SMALL("SMPTE VC-1 (CrystalHD acceleration)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_VC1, .priv_data_size = sizeof(CHDContext), @@ -1192,7 +1193,6 @@ AVCodec ff_vc1_crystalhd_decoder = { .decode = decode, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY, .flush = flush, - .long_name = NULL_IF_CONFIG_SMALL("SMPTE VC-1 (CrystalHD acceleration)"), .pix_fmts = (const enum AVPixelFormat[]){AV_PIX_FMT_YUYV422, AV_PIX_FMT_NONE}, .priv_class = &vc1_class, }; @@ -1208,6 +1208,7 @@ static AVClass wmv3_class = { AVCodec ff_wmv3_crystalhd_decoder = { .name = "wmv3_crystalhd", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9 (CrystalHD acceleration)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_WMV3, .priv_data_size = sizeof(CHDContext), @@ -1216,7 +1217,6 @@ AVCodec ff_wmv3_crystalhd_decoder = { .decode = decode, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY, .flush = flush, - .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9 (CrystalHD acceleration)"), .pix_fmts = (const enum AVPixelFormat[]){AV_PIX_FMT_YUYV422, AV_PIX_FMT_NONE}, .priv_class = &wmv3_class, }; diff --git a/libavcodec/dcaenc.c b/libavcodec/dcaenc.c index 439be47..cb73f42 100644 --- a/libavcodec/dcaenc.c +++ b/libavcodec/dcaenc.c @@ -954,6 +954,7 @@ static const AVCodecDefault defaults[] = { AVCodec ff_dca_encoder = { .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), @@ -962,7 +963,6 @@ AVCodec ff_dca_encoder = { .capabilities = CODEC_CAP_EXPERIMENTAL, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("DCA (DTS Coherent Acoustics)"), .supported_samplerates = sample_rates, .channel_layouts = (const uint64_t[]) { AV_CH_LAYOUT_MONO, AV_CH_LAYOUT_STEREO, diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index 3d70f17..15baf75 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -1927,6 +1927,7 @@ static int dirac_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVCodec ff_dirac_decoder = { .name = "dirac", + .long_name = NULL_IF_CONFIG_SMALL("BBC Dirac VC-2"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_DIRAC, .priv_data_size = sizeof(DiracContext), @@ -1935,5 +1936,4 @@ AVCodec ff_dirac_decoder = { .decode = dirac_decode_frame, .capabilities = CODEC_CAP_DELAY, .flush = dirac_decode_flush, - .long_name = NULL_IF_CONFIG_SMALL("BBC Dirac VC-2"), }; diff --git a/libavcodec/evrcdec.c b/libavcodec/evrcdec.c index f104e33..51ae9e2 100644 --- a/libavcodec/evrcdec.c +++ b/libavcodec/evrcdec.c @@ -907,11 +907,11 @@ erasure: AVCodec ff_evrc_decoder = { .name = "evrc", + .long_name = NULL_IF_CONFIG_SMALL("EVRC (Enhanced Variable Rate Codec)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_EVRC, .init = evrc_decode_init, .decode = evrc_decode_frame, .capabilities = CODEC_CAP_DR1, .priv_data_size = sizeof(EVRCContext), - .long_name = NULL_IF_CONFIG_SMALL("EVRC (Enhanced Variable Rate Codec)"), }; diff --git a/libavcodec/exr.c b/libavcodec/exr.c index cba0c4d..4be7f00 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -804,11 +804,11 @@ static av_cold int decode_end(AVCodecContext *avctx) AVCodec ff_exr_decoder = { .name = "exr", + .long_name = NULL_IF_CONFIG_SMALL("OpenEXR image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_EXR, .priv_data_size = sizeof(EXRContext), .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS | CODEC_CAP_SLICE_THREADS, - .long_name = NULL_IF_CONFIG_SMALL("OpenEXR image"), }; diff --git a/libavcodec/ffwavesynth.c b/libavcodec/ffwavesynth.c index 4f392f2..a62746d 100644 --- a/libavcodec/ffwavesynth.c +++ b/libavcodec/ffwavesynth.c @@ -473,6 +473,7 @@ static av_cold int wavesynth_close(AVCodecContext *avc) AVCodec ff_ffwavesynth_decoder = { .name = "wavesynth", + .long_name = NULL_IF_CONFIG_SMALL("Wave synthesis pseudo-codec"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_FFWAVESYNTH, .priv_data_size = sizeof(struct wavesynth_context), @@ -480,5 +481,4 @@ AVCodec ff_ffwavesynth_decoder = { .close = wavesynth_close, .decode = wavesynth_decode, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Wave synthesis pseudo-codec"), }; diff --git a/libavcodec/flashsv2enc.c b/libavcodec/flashsv2enc.c index 1d0d196..2115a46 100644 --- a/libavcodec/flashsv2enc.c +++ b/libavcodec/flashsv2enc.c @@ -920,6 +920,7 @@ static av_cold int flashsv2_encode_end(AVCodecContext * avctx) AVCodec ff_flashsv2_encoder = { .name = "flashsv2", + .long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video Version 2"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_FLASHSV2, .priv_data_size = sizeof(FlashSV2Context), @@ -927,5 +928,4 @@ AVCodec ff_flashsv2_encoder = { .encode2 = flashsv2_encode_frame, .close = flashsv2_encode_end, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_BGR24, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video Version 2"), }; diff --git a/libavcodec/g723_1.c b/libavcodec/g723_1.c index 368bbaa..09da766 100644 --- a/libavcodec/g723_1.c +++ b/libavcodec/g723_1.c @@ -2465,12 +2465,12 @@ static int g723_1_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, AVCodec ff_g723_1_encoder = { .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_encode_init, .encode2 = g723_1_encode_frame, - .long_name = NULL_IF_CONFIG_SMALL("G.723.1"), .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE}, }; diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c index 85323ba..d29ad1f 100644 --- a/libavcodec/g729dec.c +++ b/libavcodec/g729dec.c @@ -716,11 +716,11 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr, AVCodec ff_g729_decoder = { .name = "g729", + .long_name = NULL_IF_CONFIG_SMALL("G.729"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_G729, .priv_data_size = sizeof(G729Context), .init = decoder_init, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("G.729"), }; diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 5ed303a..93d4517 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -5204,6 +5204,7 @@ AVCodec ff_h264_decoder = { #if CONFIG_H264_VDPAU_DECODER AVCodec ff_h264_vdpau_decoder = { .name = "h264_vdpau", + .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 (VDPAU acceleration)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_H264, .priv_data_size = sizeof(H264Context), @@ -5212,7 +5213,6 @@ AVCodec ff_h264_vdpau_decoder = { .decode = decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU, .flush = flush_dpb, - .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 (VDPAU acceleration)"), .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_VDPAU_H264, AV_PIX_FMT_NONE}, .profiles = NULL_IF_CONFIG_SMALL(profiles), diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index fa15aad..d9f5eaf 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -1038,6 +1038,7 @@ static int j2kenc_destroy(AVCodecContext *avctx) AVCodec ff_jpeg2000_encoder = { .name = "jpeg2000", + .long_name = NULL_IF_CONFIG_SMALL("JPEG 2000"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_JPEG2000, .priv_data_size = sizeof(Jpeg2000EncoderContext), @@ -1045,7 +1046,6 @@ AVCodec ff_jpeg2000_encoder = { .encode2 = encode_frame, .close = j2kenc_destroy, .capabilities = CODEC_CAP_EXPERIMENTAL, - .long_name = NULL_IF_CONFIG_SMALL("JPEG 2000"), .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_RGB24, AV_PIX_FMT_YUV444P, AV_PIX_FMT_GRAY8, /* AV_PIX_FMT_YUV420P, diff --git a/libavcodec/libaacplus.c b/libavcodec/libaacplus.c index 9c874fb..545e240 100644 --- a/libavcodec/libaacplus.c +++ b/libavcodec/libaacplus.c @@ -124,6 +124,7 @@ static const AVProfile profiles[] = { AVCodec ff_libaacplus_encoder = { .name = "libaacplus", + .long_name = NULL_IF_CONFIG_SMALL("libaacplus AAC+ (Advanced Audio Codec with SBR+PS)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_AAC, .priv_data_size = sizeof(aacPlusAudioContext), @@ -133,7 +134,6 @@ AVCodec ff_libaacplus_encoder = { .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("libaacplus AAC+ (Advanced Audio Codec with SBR+PS)"), .profiles = profiles, .channel_layouts = (const uint64_t[]) { AV_CH_LAYOUT_MONO, AV_CH_LAYOUT_STEREO, diff --git a/libavcodec/libcelt_dec.c b/libavcodec/libcelt_dec.c index 53bbb72..4e62fe5 100644 --- a/libavcodec/libcelt_dec.c +++ b/libavcodec/libcelt_dec.c @@ -129,6 +129,7 @@ static int libcelt_dec_decode(AVCodecContext *c, void *data, AVCodec ff_libcelt_decoder = { .name = "libcelt", + .long_name = NULL_IF_CONFIG_SMALL("Xiph CELT decoder using libcelt"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_CELT, .priv_data_size = sizeof(struct libcelt_context), @@ -136,5 +137,4 @@ AVCodec ff_libcelt_decoder = { .close = libcelt_dec_close, .decode = libcelt_dec_decode, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Xiph CELT decoder using libcelt"), }; diff --git a/libavcodec/libshine.c b/libavcodec/libshine.c index cf8b1bb..2418188 100644 --- a/libavcodec/libshine.c +++ b/libavcodec/libshine.c @@ -132,6 +132,7 @@ static const int libshine_sample_rates[] = { AVCodec ff_libshine_encoder = { .name = "libshine", + .long_name = NULL_IF_CONFIG_SMALL("libshine MP3 (MPEG audio layer 3)"), .type = AVMEDIA_TYPE_AUDIO, .id = CODEC_ID_MP3, .priv_data_size = sizeof(SHINEContext), @@ -145,5 +146,4 @@ AVCodec ff_libshine_encoder = { .channel_layouts = (const uint64_t[]) { AV_CH_LAYOUT_MONO, AV_CH_LAYOUT_STEREO, 0 }, - .long_name = NULL_IF_CONFIG_SMALL("libshine MP3 (MPEG audio layer 3)"), }; diff --git a/libavcodec/libtwolame.c b/libavcodec/libtwolame.c index bc93433..dc4efe5 100644 --- a/libavcodec/libtwolame.c +++ b/libavcodec/libtwolame.c @@ -177,6 +177,7 @@ static const AVClass libtwolame_class = { AVCodec ff_libtwolame_encoder = { .name = "libtwolame", + .long_name = NULL_IF_CONFIG_SMALL("libtwolame MP2 (MPEG audio layer 2)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_MP2, .priv_data_size = sizeof(TWOLAMEContext), @@ -193,6 +194,5 @@ AVCodec ff_libtwolame_encoder = { AV_CH_LAYOUT_STEREO, 0 }, .supported_samplerates = (const int[]){ 16000, 22050, 24000, 32000, 44100, 48000, 0 }, - .long_name = NULL_IF_CONFIG_SMALL("libtwolame MP2 (MPEG audio layer 2)"), .priv_class = &libtwolame_class, }; diff --git a/libavcodec/libvorbisdec.c b/libavcodec/libvorbisdec.c index 6822656..b703b65 100644 --- a/libavcodec/libvorbisdec.c +++ b/libavcodec/libvorbisdec.c @@ -188,6 +188,7 @@ static int oggvorbis_decode_close(AVCodecContext *avccontext) { AVCodec ff_libvorbis_decoder = { .name = "libvorbis", + .long_name = NULL_IF_CONFIG_SMALL("libvorbis"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_VORBIS, .priv_data_size = sizeof(OggVorbisDecContext), @@ -195,5 +196,4 @@ AVCodec ff_libvorbis_decoder = { .decode = oggvorbis_decode_frame, .close = oggvorbis_decode_close, .capabilities = CODEC_CAP_DELAY, - .long_name = NULL_IF_CONFIG_SMALL("libvorbis"), }; diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index f9b47c9..4093510 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -760,6 +760,7 @@ AVCodec ff_libx264_encoder = { AVCodec ff_libx264rgb_encoder = { .name = "libx264rgb", + .long_name = NULL_IF_CONFIG_SMALL("libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 RGB"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_H264, .priv_data_size = sizeof(X264Context), @@ -767,7 +768,6 @@ AVCodec ff_libx264rgb_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 RGB"), .priv_class = &rgbclass, .defaults = x264_defaults, .pix_fmts = pix_fmts_8bit_rgb, diff --git a/libavcodec/libzvbi-teletextdec.c b/libavcodec/libzvbi-teletextdec.c index 11ce4b0..2f6714c 100644 --- a/libavcodec/libzvbi-teletextdec.c +++ b/libavcodec/libzvbi-teletextdec.c @@ -457,6 +457,7 @@ static const AVClass teletext_class = { AVCodec ff_libzvbi_teletext_decoder = { .name = "libzvbi_teletextdec", + .long_name = NULL_IF_CONFIG_SMALL("Libzvbi DVB teletext decoder"), .type = AVMEDIA_TYPE_SUBTITLE, .id = CODEC_ID_DVB_TELETEXT, .priv_data_size = sizeof(TeletextContext), @@ -464,6 +465,5 @@ AVCodec ff_libzvbi_teletext_decoder = { .close = teletext_close_decoder, .decode = teletext_decode_frame, .flush = teletext_flush, - .long_name = NULL_IF_CONFIG_SMALL("Libzvbi DVB teletext decoder"), .priv_class= &teletext_class, }; diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index a208f67..74817ca 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -532,6 +532,7 @@ AVCodec ff_mjpeg_encoder = { #if CONFIG_AMV_ENCODER AVCodec ff_amv_encoder = { .name = "amv", + .long_name = NULL_IF_CONFIG_SMALL("AMV Video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_AMV, .priv_data_size = sizeof(MpegEncContext), @@ -541,6 +542,5 @@ AVCodec ff_amv_encoder = { .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("AMV Video"), }; #endif diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index cc8b6c9..82b503d 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -2579,6 +2579,7 @@ AVCodec ff_mpeg2video_decoder = { //legacy decoder AVCodec ff_mpegvideo_decoder = { .name = "mpegvideo", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MPEG2VIDEO, .priv_data_size = sizeof(Mpeg1Context), @@ -2588,7 +2589,6 @@ AVCodec ff_mpegvideo_decoder = { .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS, .flush = flush, .max_lowres = 3, - .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video"), }; #if CONFIG_MPEG_XVMC_DECODER @@ -2628,6 +2628,7 @@ AVCodec ff_mpeg_xvmc_decoder = { #if CONFIG_MPEG_VDPAU_DECODER AVCodec ff_mpeg_vdpau_decoder = { .name = "mpegvideo_vdpau", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-1/2 video (VDPAU acceleration)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MPEG2VIDEO, .priv_data_size = sizeof(Mpeg1Context), @@ -2637,13 +2638,13 @@ AVCodec ff_mpeg_vdpau_decoder = { .capabilities = CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_HWACCEL_VDPAU | CODEC_CAP_DELAY, .flush = flush, - .long_name = NULL_IF_CONFIG_SMALL("MPEG-1/2 video (VDPAU acceleration)"), }; #endif #if CONFIG_MPEG1_VDPAU_DECODER AVCodec ff_mpeg1_vdpau_decoder = { .name = "mpeg1video_vdpau", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video (VDPAU acceleration)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MPEG1VIDEO, .priv_data_size = sizeof(Mpeg1Context), @@ -2653,6 +2654,5 @@ AVCodec ff_mpeg1_vdpau_decoder = { .capabilities = CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_HWACCEL_VDPAU | CODEC_CAP_DELAY, .flush = flush, - .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video (VDPAU acceleration)"), }; #endif diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index d00688a..dd97bd7 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -2390,6 +2390,7 @@ AVCodec ff_mpeg4_decoder = { #if CONFIG_MPEG4_VDPAU_DECODER AVCodec ff_mpeg4_vdpau_decoder = { .name = "mpeg4_vdpau", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 (VDPAU)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MPEG4, .priv_data_size = sizeof(MpegEncContext), @@ -2398,7 +2399,6 @@ AVCodec ff_mpeg4_vdpau_decoder = { .decode = ff_h263_decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU, - .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 (VDPAU)"), .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_VDPAU_MPEG4, AV_PIX_FMT_NONE }, .priv_class = &mpeg4_vdpau_class, diff --git a/libavcodec/msvideo1enc.c b/libavcodec/msvideo1enc.c index e0efb48..1da302a 100644 --- a/libavcodec/msvideo1enc.c +++ b/libavcodec/msvideo1enc.c @@ -300,6 +300,7 @@ static av_cold int encode_end(AVCodecContext *avctx) AVCodec ff_msvideo1_encoder = { .name = "msvideo1", + .long_name = NULL_IF_CONFIG_SMALL("Microsoft Video-1"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MSVIDEO1, .priv_data_size = sizeof(Msvideo1EncContext), @@ -307,5 +308,4 @@ AVCodec ff_msvideo1_encoder = { .encode2 = encode_frame, .close = encode_end, .pix_fmts = (const enum AVPixelFormat[]){AV_PIX_FMT_RGB555, AV_PIX_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("Microsoft Video-1"), }; diff --git a/libavcodec/mvcdec.c b/libavcodec/mvcdec.c index c4385fe..423c7c4 100644 --- a/libavcodec/mvcdec.c +++ b/libavcodec/mvcdec.c @@ -260,6 +260,7 @@ static av_cold int mvc_decode_end(AVCodecContext *avctx) #if CONFIG_MVC1_DECODER AVCodec ff_mvc1_decoder = { .name = "mvc1", + .long_name = NULL_IF_CONFIG_SMALL("Silicon Graphics Motion Video Compressor 1"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MVC1, .priv_data_size = sizeof(MvcContext), @@ -267,13 +268,13 @@ AVCodec ff_mvc1_decoder = { .close = mvc_decode_end, .decode = mvc_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Silicon Graphics Motion Video Compressor 1"), }; #endif #if CONFIG_MVC2_DECODER AVCodec ff_mvc2_decoder = { .name = "mvc2", + .long_name = NULL_IF_CONFIG_SMALL("Silicon Graphics Motion Video Compressor 2"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MVC2, .priv_data_size = sizeof(MvcContext), @@ -281,6 +282,5 @@ AVCodec ff_mvc2_decoder = { .close = mvc_decode_end, .decode = mvc_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Silicon Graphics Motion Video Compressor 2"), }; #endif diff --git a/libavcodec/paf.c b/libavcodec/paf.c index 300238e..76c90c9 100644 --- a/libavcodec/paf.c +++ b/libavcodec/paf.c @@ -430,6 +430,7 @@ static int paf_aud_decode(AVCodecContext *avctx, void *data, AVCodec ff_paf_video_decoder = { .name = "paf_video", + .long_name = NULL_IF_CONFIG_SMALL("Amazing Studio Packed Animation File Video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PAF_VIDEO, .priv_data_size = sizeof(PAFVideoDecContext), @@ -437,15 +438,14 @@ AVCodec ff_paf_video_decoder = { .close = paf_vid_close, .decode = paf_vid_decode, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Amazing Studio Packed Animation File Video"), }; AVCodec ff_paf_audio_decoder = { .name = "paf_audio", + .long_name = NULL_IF_CONFIG_SMALL("Amazing Studio Packed Animation File Audio"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_PAF_AUDIO, .init = paf_aud_init, .decode = paf_aud_decode, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Amazing Studio Packed Animation File Audio"), }; diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c index 4950652..3fee85a 100644 --- a/libavcodec/proresdec2.c +++ b/libavcodec/proresdec2.c @@ -662,12 +662,12 @@ static av_cold int decode_close(AVCodecContext *avctx) AVCodec ff_prores_decoder = { .name = "prores", + .long_name = NULL_IF_CONFIG_SMALL("ProRes"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PRORES, .priv_data_size = sizeof(ProresContext), .init = decode_init, .close = decode_close, .decode = decode_frame, - .long_name = NULL_IF_CONFIG_SMALL("ProRes"), .capabilities = CODEC_CAP_DR1 | CODEC_CAP_SLICE_THREADS, }; diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index ccd0392..e124b41 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -599,6 +599,7 @@ static av_cold int prores_encode_close(AVCodecContext *avctx) AVCodec ff_prores_aw_encoder = { .name = "prores_aw", + .long_name = NULL_IF_CONFIG_SMALL("Apple ProRes"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PRORES, .priv_data_size = sizeof(ProresContext), @@ -606,13 +607,13 @@ AVCodec ff_prores_aw_encoder = { .close = prores_encode_close, .encode2 = prores_encode_frame, .pix_fmts = (const enum AVPixelFormat[]){AV_PIX_FMT_YUV422P10, AV_PIX_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("Apple ProRes"), .capabilities = CODEC_CAP_FRAME_THREADS | CODEC_CAP_INTRA_ONLY, .profiles = profiles }; AVCodec ff_prores_encoder = { .name = "prores", + .long_name = NULL_IF_CONFIG_SMALL("Apple ProRes"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PRORES, .priv_data_size = sizeof(ProresContext), @@ -620,7 +621,6 @@ AVCodec ff_prores_encoder = { .close = prores_encode_close, .encode2 = prores_encode_frame, .pix_fmts = (const enum AVPixelFormat[]){AV_PIX_FMT_YUV422P10, AV_PIX_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("Apple ProRes"), .capabilities = CODEC_CAP_FRAME_THREADS | CODEC_CAP_INTRA_ONLY, .profiles = profiles }; diff --git a/libavcodec/r210dec.c b/libavcodec/r210dec.c index dda4372..cbebf7c 100644 --- a/libavcodec/r210dec.c +++ b/libavcodec/r210dec.c @@ -112,11 +112,11 @@ AVCodec ff_r10k_decoder = { #if CONFIG_AVRP_DECODER AVCodec ff_avrp_decoder = { .name = "avrp", + .long_name = NULL_IF_CONFIG_SMALL("Avid 1:1 10-bit RGB Packer"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_AVRP, .init = decode_init, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Avid 1:1 10-bit RGB Packer"), }; #endif diff --git a/libavcodec/r210enc.c b/libavcodec/r210enc.c index e19a27e..80230f5 100644 --- a/libavcodec/r210enc.c +++ b/libavcodec/r210enc.c @@ -88,36 +88,36 @@ static av_cold int encode_close(AVCodecContext *avctx) #if CONFIG_R210_ENCODER AVCodec ff_r210_encoder = { .name = "r210", + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed RGB 10-bit"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_R210, .init = encode_init, .encode2 = encode_frame, .close = encode_close, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_RGB48, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed RGB 10-bit"), }; #endif #if CONFIG_R10K_ENCODER AVCodec ff_r10k_encoder = { .name = "r10k", + .long_name = NULL_IF_CONFIG_SMALL("AJA Kona 10-bit RGB Codec"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_R10K, .init = encode_init, .encode2 = encode_frame, .close = encode_close, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_RGB48, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("AJA Kona 10-bit RGB Codec"), }; #endif #if CONFIG_AVRP_ENCODER AVCodec ff_avrp_encoder = { .name = "avrp", + .long_name = NULL_IF_CONFIG_SMALL("Avid 1:1 10-bit RGB Packer"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_AVRP, .init = encode_init, .encode2 = encode_frame, .close = encode_close, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_RGB48, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Avid 1:1 10-bit RGB Packer"), }; #endif diff --git a/libavcodec/s302menc.c b/libavcodec/s302menc.c index 6af5dfe..c428d54 100644 --- a/libavcodec/s302menc.c +++ b/libavcodec/s302menc.c @@ -163,12 +163,12 @@ static int s302m_encode2_frame(AVCodecContext *avctx, AVPacket *avpkt, AVCodec ff_s302m_encoder = { .name = "s302m", + .long_name = NULL_IF_CONFIG_SMALL("SMPTE 302M"), .type = AVMEDIA_TYPE_AUDIO, .id = CODEC_ID_S302M, .priv_data_size = sizeof(S302MEncContext), .init = s302m_encode_init, .encode2 = s302m_encode2_frame, - .long_name = NULL_IF_CONFIG_SMALL("SMPTE 302M"), .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c index d1ef0ce..76da8bb 100644 --- a/libavcodec/sanm.c +++ b/libavcodec/sanm.c @@ -1296,6 +1296,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_sanm_decoder = { .name = "sanm", + .long_name = NULL_IF_CONFIG_SMALL("LucasArts SMUSH video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_SANM, .priv_data_size = sizeof(SANMVideoContext), @@ -1303,5 +1304,4 @@ AVCodec ff_sanm_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("LucasArts SMUSH video"), }; diff --git a/libavcodec/sgirledec.c b/libavcodec/sgirledec.c index 6cdc8d6..fd3cc5e 100644 --- a/libavcodec/sgirledec.c +++ b/libavcodec/sgirledec.c @@ -140,6 +140,7 @@ static av_cold int sgirle_decode_end(AVCodecContext *avctx) AVCodec ff_sgirle_decoder = { .name = "sgirle", + .long_name = NULL_IF_CONFIG_SMALL("SGI RLE 8-bit"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_SGIRLE, .priv_data_size = sizeof(SGIRLEContext), @@ -147,5 +148,4 @@ AVCodec ff_sgirle_decoder = { .close = sgirle_decode_end, .decode = sgirle_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("SGI RLE 8-bit"), }; diff --git a/libavcodec/smvjpegdec.c b/libavcodec/smvjpegdec.c index 7d84839..f883ecf 100644 --- a/libavcodec/smvjpegdec.c +++ b/libavcodec/smvjpegdec.c @@ -194,12 +194,12 @@ static const AVClass smvjpegdec_class = { AVCodec ff_smvjpeg_decoder = { .name = "smvjpeg", + .long_name = NULL_IF_CONFIG_SMALL("SMV JPEG"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_SMVJPEG, .priv_data_size = sizeof(SMVJpegDecodeContext), .init = smvjpeg_decode_init, .close = smvjpeg_decode_end, .decode = smvjpeg_decode_frame, - .long_name = NULL_IF_CONFIG_SMALL("SMV JPEG"), .priv_class = &smvjpegdec_class, }; diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c index 8bd4dc1..c9d40b8 100644 --- a/libavcodec/snowdec.c +++ b/libavcodec/snowdec.c @@ -587,6 +587,7 @@ static av_cold int decode_end(AVCodecContext *avctx) AVCodec ff_snow_decoder = { .name = "snow", + .long_name = NULL_IF_CONFIG_SMALL("Snow"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_SNOW, .priv_data_size = sizeof(SnowContext), @@ -594,5 +595,4 @@ AVCodec ff_snow_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1 /*| CODEC_CAP_DRAW_HORIZ_BAND*/, - .long_name = NULL_IF_CONFIG_SMALL("Snow"), }; diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index 57824d1..5177285 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -1878,6 +1878,7 @@ static const AVClass snowenc_class = { AVCodec ff_snow_encoder = { .name = "snow", + .long_name = NULL_IF_CONFIG_SMALL("Snow"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_SNOW, .priv_data_size = sizeof(SnowContext), @@ -1889,7 +1890,6 @@ AVCodec ff_snow_encoder = { AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Snow"), .priv_class = &snowenc_class, }; diff --git a/libavcodec/sonic.c b/libavcodec/sonic.c index 7a9db36..31bbe46 100644 --- a/libavcodec/sonic.c +++ b/libavcodec/sonic.c @@ -947,6 +947,7 @@ static int sonic_decode_frame(AVCodecContext *avctx, AVCodec ff_sonic_decoder = { .name = "sonic", + .long_name = NULL_IF_CONFIG_SMALL("Sonic"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_SONIC, .priv_data_size = sizeof(SonicContext), @@ -954,13 +955,13 @@ AVCodec ff_sonic_decoder = { .close = sonic_decode_close, .decode = sonic_decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_EXPERIMENTAL, - .long_name = NULL_IF_CONFIG_SMALL("Sonic"), }; #endif /* CONFIG_SONIC_DECODER */ #if CONFIG_SONIC_ENCODER AVCodec ff_sonic_encoder = { .name = "sonic", + .long_name = NULL_IF_CONFIG_SMALL("Sonic"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_SONIC, .priv_data_size = sizeof(SonicContext), @@ -969,13 +970,13 @@ AVCodec ff_sonic_encoder = { .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, .capabilities = CODEC_CAP_EXPERIMENTAL, .close = sonic_encode_close, - .long_name = NULL_IF_CONFIG_SMALL("Sonic"), }; #endif #if CONFIG_SONIC_LS_ENCODER AVCodec ff_sonic_ls_encoder = { .name = "sonicls", + .long_name = NULL_IF_CONFIG_SMALL("Sonic lossless"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_SONIC_LS, .priv_data_size = sizeof(SonicContext), @@ -984,6 +985,5 @@ AVCodec ff_sonic_ls_encoder = { .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, .capabilities = CODEC_CAP_EXPERIMENTAL, .close = sonic_encode_close, - .long_name = NULL_IF_CONFIG_SMALL("Sonic lossless"), }; #endif diff --git a/libavcodec/targa_y216dec.c b/libavcodec/targa_y216dec.c index d67d193..5f4eeaa 100644 --- a/libavcodec/targa_y216dec.c +++ b/libavcodec/targa_y216dec.c @@ -74,10 +74,10 @@ static int y216_decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_targa_y216_decoder = { .name = "targa_y216", + .long_name = NULL_IF_CONFIG_SMALL("Pinnacle TARGA CineWave YUV16"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_TARGA_Y216, .init = y216_decode_init, .decode = y216_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Pinnacle TARGA CineWave YUV16"), }; diff --git a/libavcodec/textdec.c b/libavcodec/textdec.c index f3e6117..a8f9e40 100644 --- a/libavcodec/textdec.c +++ b/libavcodec/textdec.c @@ -118,8 +118,8 @@ DECLARE_CLASS(text); AVCodec ff_text_decoder = { .name = "text", - .priv_data_size = sizeof(TextContext), .long_name = NULL_IF_CONFIG_SMALL("Raw text subtitle"), + .priv_data_size = sizeof(TextContext), .type = AVMEDIA_TYPE_SUBTITLE, .id = AV_CODEC_ID_TEXT, .decode = text_decode_frame, @@ -143,8 +143,8 @@ DECLARE_CLASS(vplayer); AVCodec ff_vplayer_decoder = { .name = "vplayer", - .priv_data_size = sizeof(TextContext), .long_name = NULL_IF_CONFIG_SMALL("VPlayer subtitle"), + .priv_data_size = sizeof(TextContext), .type = AVMEDIA_TYPE_SUBTITLE, .id = AV_CODEC_ID_VPLAYER, .decode = text_decode_frame, @@ -159,8 +159,8 @@ DECLARE_CLASS(pjs); AVCodec ff_pjs_decoder = { .name = "pjs", - .priv_data_size = sizeof(TextContext), .long_name = NULL_IF_CONFIG_SMALL("PJS subtitle"), + .priv_data_size = sizeof(TextContext), .type = AVMEDIA_TYPE_SUBTITLE, .id = AV_CODEC_ID_PJS, .decode = text_decode_frame, @@ -175,8 +175,8 @@ DECLARE_CLASS(subviewer1); AVCodec ff_subviewer1_decoder = { .name = "subviewer1", - .priv_data_size = sizeof(TextContext), .long_name = NULL_IF_CONFIG_SMALL("SubViewer1 subtitle"), + .priv_data_size = sizeof(TextContext), .type = AVMEDIA_TYPE_SUBTITLE, .id = AV_CODEC_ID_SUBVIEWER1, .decode = text_decode_frame, diff --git a/libavcodec/ttaenc.c b/libavcodec/ttaenc.c index 55599cc..e95dd6b 100644 --- a/libavcodec/ttaenc.c +++ b/libavcodec/ttaenc.c @@ -217,6 +217,7 @@ static av_cold int tta_encode_close(AVCodecContext *avctx) AVCodec ff_tta_encoder = { .name = "tta", + .long_name = NULL_IF_CONFIG_SMALL("TTA (True Audio)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_TTA, .priv_data_size = sizeof(TTAEncContext), @@ -228,5 +229,4 @@ AVCodec ff_tta_encoder = { AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("TTA (True Audio)"), }; diff --git a/libavcodec/v308dec.c b/libavcodec/v308dec.c index 75d65e8..1d31f0a 100644 --- a/libavcodec/v308dec.c +++ b/libavcodec/v308dec.c @@ -74,10 +74,10 @@ static int v308_decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_v308_decoder = { .name = "v308", + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed 4:4:4"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_V308, .init = v308_decode_init, .decode = v308_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed 4:4:4"), }; diff --git a/libavcodec/v308enc.c b/libavcodec/v308enc.c index 10437cc..7a97d5a 100644 --- a/libavcodec/v308enc.c +++ b/libavcodec/v308enc.c @@ -84,11 +84,11 @@ static av_cold int v308_encode_close(AVCodecContext *avctx) AVCodec ff_v308_encoder = { .name = "v308", + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed 4:4:4"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_V308, .init = v308_encode_init, .encode2 = v308_encode_frame, .close = v308_encode_close, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV444P, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed 4:4:4"), }; diff --git a/libavcodec/v408dec.c b/libavcodec/v408dec.c index 751650d..be442fa 100644 --- a/libavcodec/v408dec.c +++ b/libavcodec/v408dec.c @@ -82,22 +82,22 @@ static int v408_decode_frame(AVCodecContext *avctx, void *data, #if CONFIG_AYUV_DECODER AVCodec ff_ayuv_decoder = { .name = "ayuv", + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed MS 4:4:4:4"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_AYUV, .init = v408_decode_init, .decode = v408_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed MS 4:4:4:4"), }; #endif #if CONFIG_V408_DECODER AVCodec ff_v408_decoder = { .name = "v408", + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed QT 4:4:4:4"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_V408, .init = v408_decode_init, .decode = v408_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed QT 4:4:4:4"), }; #endif diff --git a/libavcodec/v408enc.c b/libavcodec/v408enc.c index 694bdbf..85cf7c8 100644 --- a/libavcodec/v408enc.c +++ b/libavcodec/v408enc.c @@ -90,24 +90,24 @@ static av_cold int v408_encode_close(AVCodecContext *avctx) #if CONFIG_AYUV_ENCODER AVCodec ff_ayuv_encoder = { .name = "ayuv", + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed MS 4:4:4:4"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_AYUV, .init = v408_encode_init, .encode2 = v408_encode_frame, .close = v408_encode_close, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUVA444P, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed MS 4:4:4:4"), }; #endif #if CONFIG_V408_ENCODER AVCodec ff_v408_encoder = { .name = "v408", + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed QT 4:4:4:4"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_V408, .init = v408_encode_init, .encode2 = v408_encode_frame, .close = v408_encode_close, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUVA444P, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed QT 4:4:4:4"), }; #endif diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 74a1a6c..6749c2b 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -6278,6 +6278,7 @@ AVCodec ff_wmv3_decoder = { #if CONFIG_WMV3_VDPAU_DECODER AVCodec ff_wmv3_vdpau_decoder = { .name = "wmv3_vdpau", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9 VDPAU"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_WMV3, .priv_data_size = sizeof(VC1Context), @@ -6285,7 +6286,6 @@ AVCodec ff_wmv3_vdpau_decoder = { .close = ff_vc1_decode_end, .decode = vc1_decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU, - .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9 VDPAU"), .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_VDPAU_WMV3, AV_PIX_FMT_NONE }, .profiles = NULL_IF_CONFIG_SMALL(profiles) }; @@ -6294,6 +6294,7 @@ AVCodec ff_wmv3_vdpau_decoder = { #if CONFIG_VC1_VDPAU_DECODER AVCodec ff_vc1_vdpau_decoder = { .name = "vc1_vdpau", + .long_name = NULL_IF_CONFIG_SMALL("SMPTE VC-1 VDPAU"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_VC1, .priv_data_size = sizeof(VC1Context), @@ -6301,7 +6302,6 @@ AVCodec ff_vc1_vdpau_decoder = { .close = ff_vc1_decode_end, .decode = vc1_decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU, - .long_name = NULL_IF_CONFIG_SMALL("SMPTE VC-1 VDPAU"), .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_VDPAU_VC1, AV_PIX_FMT_NONE }, .profiles = NULL_IF_CONFIG_SMALL(profiles) }; diff --git a/libavcodec/vima.c b/libavcodec/vima.c index 0513ee2..f040e1b 100644 --- a/libavcodec/vima.c +++ b/libavcodec/vima.c @@ -230,10 +230,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_vima_decoder = { .name = "vima", + .long_name = NULL_IF_CONFIG_SMALL("LucasArts VIMA audio"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_VIMA, .init = decode_init, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("LucasArts VIMA audio"), }; diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 7387c3f..c302ff6 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -2169,6 +2169,7 @@ AVCodec ff_vp8_decoder = { // AVCodec ff_webp_decoder = { // .name = "webp", +// .long_name = NULL_IF_CONFIG_SMALL("WebP"), // .type = AVMEDIA_TYPE_VIDEO, // .id = AV_CODEC_ID_WEBP, // .priv_data_size = sizeof(VP8Context), @@ -2177,7 +2178,6 @@ AVCodec ff_vp8_decoder = { // .decode = webp_decode_frame, // .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS | CODEC_CAP_SLICE_THREADS, // .flush = vp8_decode_flush, -// .long_name = NULL_IF_CONFIG_SMALL("WebP"), // .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/vp9.c b/libavcodec/vp9.c index a4aa97a..0eb92f8 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -3564,6 +3564,7 @@ static av_cold int vp9_decode_free(AVCodecContext *ctx) AVCodec ff_vp9_decoder = { .name = "vp9", + .long_name = NULL_IF_CONFIG_SMALL("Google VP9"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_VP9, .priv_data_size = sizeof(VP9Context), @@ -3572,5 +3573,4 @@ AVCodec ff_vp9_decoder = { .decode = vp9_decode_packet, .capabilities = CODEC_CAP_DR1, .flush = vp9_decode_flush, - .long_name = NULL_IF_CONFIG_SMALL("Google VP9"), }; diff --git a/libavcodec/xbmdec.c b/libavcodec/xbmdec.c index 6b189c0..2976bec 100644 --- a/libavcodec/xbmdec.c +++ b/libavcodec/xbmdec.c @@ -110,10 +110,10 @@ static int xbm_decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_xbm_decoder = { .name = "xbm", + .long_name = NULL_IF_CONFIG_SMALL("XBM (X BitMap) image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_XBM, .init = xbm_decode_init, .decode = xbm_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("XBM (X BitMap) image"), }; diff --git a/libavcodec/xfacedec.c b/libavcodec/xfacedec.c index fbaabdb..d045cb6 100644 --- a/libavcodec/xfacedec.c +++ b/libavcodec/xfacedec.c @@ -178,11 +178,11 @@ static int xface_decode_frame(AVCodecContext *avctx, AVCodec ff_xface_decoder = { .name = "xface", + .long_name = NULL_IF_CONFIG_SMALL("X-face image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_XFACE, .priv_data_size = sizeof(XFaceContext), .init = xface_decode_init, .decode = xface_decode_frame, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_MONOWHITE, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("X-face image"), }; diff --git a/libavcodec/xfaceenc.c b/libavcodec/xfaceenc.c index 5206afd..e737f6d 100644 --- a/libavcodec/xfaceenc.c +++ b/libavcodec/xfaceenc.c @@ -227,6 +227,7 @@ static av_cold int xface_encode_close(AVCodecContext *avctx) AVCodec ff_xface_encoder = { .name = "xface", + .long_name = NULL_IF_CONFIG_SMALL("X-face image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_XFACE, .priv_data_size = sizeof(XFaceContext), @@ -234,5 +235,4 @@ AVCodec ff_xface_encoder = { .close = xface_encode_close, .encode2 = xface_encode_frame, .pix_fmts = (const enum PixelFormat[]) { AV_PIX_FMT_MONOWHITE, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("X-face image"), }; diff --git a/libavcodec/y41pdec.c b/libavcodec/y41pdec.c index 70b68aa..9d1e531 100644 --- a/libavcodec/y41pdec.c +++ b/libavcodec/y41pdec.c @@ -83,10 +83,10 @@ static int y41p_decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_y41p_decoder = { .name = "y41p", + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed YUV 4:1:1 12-bit"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_Y41P, .init = y41p_decode_init, .decode = y41p_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed YUV 4:1:1 12-bit"), }; diff --git a/libavcodec/y41penc.c b/libavcodec/y41penc.c index 1a8f0fb..41666cc 100644 --- a/libavcodec/y41penc.c +++ b/libavcodec/y41penc.c @@ -91,6 +91,7 @@ static av_cold int y41p_encode_close(AVCodecContext *avctx) AVCodec ff_y41p_encoder = { .name = "y41p", + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed YUV 4:1:1 12-bit"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_Y41P, .init = y41p_encode_init, @@ -98,5 +99,4 @@ AVCodec ff_y41p_encoder = { .close = y41p_encode_close, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV411P, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed YUV 4:1:1 12-bit"), }; diff --git a/libavcodec/yuv4dec.c b/libavcodec/yuv4dec.c index 1d1fdd0..00ccf58 100644 --- a/libavcodec/yuv4dec.c +++ b/libavcodec/yuv4dec.c @@ -75,10 +75,10 @@ static int yuv4_decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_yuv4_decoder = { .name = "yuv4", + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed 4:2:0"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_YUV4, .init = yuv4_decode_init, .decode = yuv4_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed 4:2:0"), }; diff --git a/libavcodec/yuv4enc.c b/libavcodec/yuv4enc.c index 6e2f9bc..8d3907b 100644 --- a/libavcodec/yuv4enc.c +++ b/libavcodec/yuv4enc.c @@ -81,11 +81,11 @@ static av_cold int yuv4_encode_close(AVCodecContext *avctx) AVCodec ff_yuv4_encoder = { .name = "yuv4", + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed 4:2:0"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_YUV4, .init = yuv4_encode_init, .encode2 = yuv4_encode_frame, .close = yuv4_encode_close, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed 4:2:0"), }; |
