Commit f06269dd authored by Paul B Mahol's avatar Paul B Mahol

cosmetics: align more codecs declarations

Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
parent a7fbc5d0
...@@ -225,7 +225,7 @@ AVCodec ff_bintext_decoder = { ...@@ -225,7 +225,7 @@ AVCodec ff_bintext_decoder = {
.close = decode_end, .close = decode_end,
.decode = decode_frame, .decode = decode_frame,
.capabilities = CODEC_CAP_DR1, .capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("Binary text"), .long_name = NULL_IF_CONFIG_SMALL("Binary text"),
}; };
#endif #endif
#if CONFIG_XBIN_DECODER #if CONFIG_XBIN_DECODER
...@@ -238,7 +238,7 @@ AVCodec ff_xbin_decoder = { ...@@ -238,7 +238,7 @@ AVCodec ff_xbin_decoder = {
.close = decode_end, .close = decode_end,
.decode = decode_frame, .decode = decode_frame,
.capabilities = CODEC_CAP_DR1, .capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("eXtended BINary text"), .long_name = NULL_IF_CONFIG_SMALL("eXtended BINary text"),
}; };
#endif #endif
#if CONFIG_IDF_DECODER #if CONFIG_IDF_DECODER
...@@ -251,6 +251,6 @@ AVCodec ff_idf_decoder = { ...@@ -251,6 +251,6 @@ AVCodec ff_idf_decoder = {
.close = decode_end, .close = decode_end,
.decode = decode_frame, .decode = decode_frame,
.capabilities = CODEC_CAP_DR1, .capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("iCEDraw text"), .long_name = NULL_IF_CONFIG_SMALL("iCEDraw text"),
}; };
#endif #endif
...@@ -596,6 +596,7 @@ AVCodec ff_dca_encoder = { ...@@ -596,6 +596,7 @@ AVCodec ff_dca_encoder = {
.init = encode_init, .init = encode_init,
.encode2 = encode_frame, .encode2 = encode_frame,
.capabilities = CODEC_CAP_EXPERIMENTAL, .capabilities = CODEC_CAP_EXPERIMENTAL,
.sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_NONE },
.long_name = NULL_IF_CONFIG_SMALL("DCA (DTS Coherent Acoustics)"), .long_name = NULL_IF_CONFIG_SMALL("DCA (DTS Coherent Acoustics)"),
}; };
...@@ -315,5 +315,5 @@ AVCodec ff_escape130_decoder = { ...@@ -315,5 +315,5 @@ AVCodec ff_escape130_decoder = {
.close = escape130_decode_close, .close = escape130_decode_close,
.decode = escape130_decode_frame, .decode = escape130_decode_frame,
.capabilities = CODEC_CAP_DR1, .capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("Escape 130"), .long_name = NULL_IF_CONFIG_SMALL("Escape 130"),
}; };
...@@ -2067,7 +2067,15 @@ AVCodec ff_ffv1_encoder = { ...@@ -2067,7 +2067,15 @@ AVCodec ff_ffv1_encoder = {
.encode2 = encode_frame, .encode2 = encode_frame,
.close = common_end, .close = common_end,
.capabilities = CODEC_CAP_SLICE_THREADS, .capabilities = CODEC_CAP_SLICE_THREADS,
.pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUVA420P, PIX_FMT_YUVA422P, PIX_FMT_YUV444P, PIX_FMT_YUVA444P, PIX_FMT_YUV440P, PIX_FMT_YUV422P, PIX_FMT_YUV411P, PIX_FMT_YUV410P, PIX_FMT_0RGB32, PIX_FMT_RGB32, PIX_FMT_YUV420P16, PIX_FMT_YUV422P16, PIX_FMT_YUV444P16, PIX_FMT_YUV444P9, PIX_FMT_YUV422P9, PIX_FMT_YUV420P9, PIX_FMT_YUV420P10, PIX_FMT_YUV422P10, PIX_FMT_YUV444P10, PIX_FMT_GRAY16, PIX_FMT_GRAY8, PIX_FMT_NONE}, .pix_fmts = (const enum PixelFormat[]){
PIX_FMT_YUV420P, PIX_FMT_YUVA420P, PIX_FMT_YUVA422P, PIX_FMT_YUV444P,
PIX_FMT_YUVA444P, PIX_FMT_YUV440P, PIX_FMT_YUV422P, PIX_FMT_YUV411P,
PIX_FMT_YUV410P, PIX_FMT_0RGB32, PIX_FMT_RGB32, PIX_FMT_YUV420P16,
PIX_FMT_YUV422P16, PIX_FMT_YUV444P16, PIX_FMT_YUV444P9, PIX_FMT_YUV422P9,
PIX_FMT_YUV420P9, PIX_FMT_YUV420P10, PIX_FMT_YUV422P10, PIX_FMT_YUV444P10,
PIX_FMT_GRAY16, PIX_FMT_GRAY8,
PIX_FMT_NONE
},
.long_name = NULL_IF_CONFIG_SMALL("FFmpeg video codec #1"), .long_name = NULL_IF_CONFIG_SMALL("FFmpeg video codec #1"),
.priv_class = &class, .priv_class = &class,
}; };
......
...@@ -1052,9 +1052,11 @@ AVCodec ff_jpeg2000_encoder = { ...@@ -1052,9 +1052,11 @@ AVCodec ff_jpeg2000_encoder = {
.close = j2kenc_destroy, .close = j2kenc_destroy,
.capabilities = CODEC_CAP_EXPERIMENTAL, .capabilities = CODEC_CAP_EXPERIMENTAL,
.long_name = NULL_IF_CONFIG_SMALL("JPEG 2000"), .long_name = NULL_IF_CONFIG_SMALL("JPEG 2000"),
.pix_fmts = (const enum PixelFormat[]) { PIX_FMT_RGB24, PIX_FMT_YUV444P, PIX_FMT_GRAY8, .pix_fmts = (const enum PixelFormat[]) {
/* PIX_FMT_YUV420P, PIX_FMT_RGB24, PIX_FMT_YUV444P, PIX_FMT_GRAY8,
PIX_FMT_YUV422P, PIX_FMT_YUV444P, /* PIX_FMT_YUV420P,
PIX_FMT_YUV410P, PIX_FMT_YUV411P,*/ PIX_FMT_YUV422P, PIX_FMT_YUV444P,
PIX_FMT_NONE } PIX_FMT_YUV410P, PIX_FMT_YUV411P,*/
PIX_FMT_NONE
}
}; };
...@@ -137,6 +137,7 @@ AVCodec ff_libaacplus_encoder = { ...@@ -137,6 +137,7 @@ AVCodec ff_libaacplus_encoder = {
.init = aacPlus_encode_init, .init = aacPlus_encode_init,
.encode2 = aacPlus_encode_frame, .encode2 = aacPlus_encode_frame,
.close = aacPlus_encode_close, .close = aacPlus_encode_close,
.sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE}, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
.long_name = NULL_IF_CONFIG_SMALL("libaacplus AAC+ (Advanced Audio Codec with SBR+PS)"), AV_SAMPLE_FMT_NONE },
.long_name = NULL_IF_CONFIG_SMALL("libaacplus AAC+ (Advanced Audio Codec with SBR+PS)"),
}; };
...@@ -452,15 +452,17 @@ AVCodec ff_libopenjpeg_encoder = { ...@@ -452,15 +452,17 @@ AVCodec ff_libopenjpeg_encoder = {
.encode2 = libopenjpeg_encode_frame, .encode2 = libopenjpeg_encode_frame,
.close = libopenjpeg_encode_close, .close = libopenjpeg_encode_close,
.capabilities = 0, .capabilities = 0,
.pix_fmts = (const enum PixelFormat[]){PIX_FMT_RGB24,PIX_FMT_RGBA,PIX_FMT_RGB48,PIX_FMT_RGBA64, .pix_fmts = (const enum PixelFormat[]){
PIX_FMT_GRAY8,PIX_FMT_GRAY8A,PIX_FMT_GRAY16, PIX_FMT_RGB24, PIX_FMT_RGBA, PIX_FMT_RGB48, PIX_FMT_RGBA64,
PIX_FMT_YUV420P,PIX_FMT_YUV422P,PIX_FMT_YUVA420P, PIX_FMT_GRAY8, PIX_FMT_GRAY8A, PIX_FMT_GRAY16,
PIX_FMT_YUV440P,PIX_FMT_YUV444P,PIX_FMT_YUVA422P, PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_YUVA420P,
PIX_FMT_YUV411P,PIX_FMT_YUV410P,PIX_FMT_YUVA444P, PIX_FMT_YUV440P, PIX_FMT_YUV444P, PIX_FMT_YUVA422P,
PIX_FMT_YUV420P9,PIX_FMT_YUV422P9,PIX_FMT_YUV444P9, PIX_FMT_YUV411P, PIX_FMT_YUV410P, PIX_FMT_YUVA444P,
PIX_FMT_YUV420P10,PIX_FMT_YUV422P10,PIX_FMT_YUV444P10, PIX_FMT_YUV420P9, PIX_FMT_YUV422P9, PIX_FMT_YUV444P9,
PIX_FMT_YUV420P16,PIX_FMT_YUV422P16,PIX_FMT_YUV444P16, PIX_FMT_YUV420P10, PIX_FMT_YUV422P10, PIX_FMT_YUV444P10,
PIX_FMT_NONE}, PIX_FMT_YUV420P16, PIX_FMT_YUV422P16, PIX_FMT_YUV444P16,
.long_name = NULL_IF_CONFIG_SMALL("OpenJPEG JPEG 2000"), PIX_FMT_NONE
},
.long_name = NULL_IF_CONFIG_SMALL("OpenJPEG JPEG 2000"),
.priv_class = &class, .priv_class = &class,
}; };
...@@ -499,6 +499,8 @@ AVCodec ff_amv_encoder = { ...@@ -499,6 +499,8 @@ AVCodec ff_amv_encoder = {
.init = ff_MPV_encode_init, .init = ff_MPV_encode_init,
.encode2 = amv_encode_picture, .encode2 = amv_encode_picture,
.close = ff_MPV_encode_end, .close = ff_MPV_encode_end,
.pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUVJ420P, PIX_FMT_YUVJ422P, PIX_FMT_NONE}, .pix_fmts = (const enum PixelFormat[]){
PIX_FMT_YUVJ420P, PIX_FMT_YUVJ422P, PIX_FMT_NONE
},
.long_name = NULL_IF_CONFIG_SMALL("AMV Video"), .long_name = NULL_IF_CONFIG_SMALL("AMV Video"),
}; };
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment