[FFmpeg-cvslog] cosmetics: align more codecs declarations
Paul B Mahol
git at videolan.org
Tue Jun 12 22:56:20 CEST 2012
ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Tue Jun 12 20:41:18 2012 +0000| [f06269dda5cab9d5e5dc591fbe3f752aae2b0a2b] | committer: Paul B Mahol
cosmetics: align more codecs declarations
Signed-off-by: Paul B Mahol <onemda at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f06269dda5cab9d5e5dc591fbe3f752aae2b0a2b
---
libavcodec/bintext.c | 6 +++---
libavcodec/dcaenc.c | 3 ++-
libavcodec/escape130.c | 2 +-
libavcodec/ffv1.c | 10 +++++++++-
libavcodec/j2kenc.c | 12 +++++++-----
libavcodec/libaacplus.c | 5 +++--
libavcodec/libopenjpegenc.c | 22 ++++++++++++----------
libavcodec/mjpegenc.c | 4 +++-
8 files changed, 40 insertions(+), 24 deletions(-)
diff --git a/libavcodec/bintext.c b/libavcodec/bintext.c
index e4507e5..d0b6cc0 100644
--- a/libavcodec/bintext.c
+++ b/libavcodec/bintext.c
@@ -225,7 +225,7 @@ AVCodec ff_bintext_decoder = {
.close = decode_end,
.decode = decode_frame,
.capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Binary text"),
+ .long_name = NULL_IF_CONFIG_SMALL("Binary text"),
};
#endif
#if CONFIG_XBIN_DECODER
@@ -238,7 +238,7 @@ AVCodec ff_xbin_decoder = {
.close = decode_end,
.decode = decode_frame,
.capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("eXtended BINary text"),
+ .long_name = NULL_IF_CONFIG_SMALL("eXtended BINary text"),
};
#endif
#if CONFIG_IDF_DECODER
@@ -251,6 +251,6 @@ AVCodec ff_idf_decoder = {
.close = decode_end,
.decode = decode_frame,
.capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("iCEDraw text"),
+ .long_name = NULL_IF_CONFIG_SMALL("iCEDraw text"),
};
#endif
diff --git a/libavcodec/dcaenc.c b/libavcodec/dcaenc.c
index f0b6f81..6879321 100644
--- a/libavcodec/dcaenc.c
+++ b/libavcodec/dcaenc.c
@@ -596,6 +596,7 @@ AVCodec ff_dca_encoder = {
.init = encode_init,
.encode2 = encode_frame,
.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)"),
};
diff --git a/libavcodec/escape130.c b/libavcodec/escape130.c
index c9f4d77..a590f89 100644
--- a/libavcodec/escape130.c
+++ b/libavcodec/escape130.c
@@ -315,5 +315,5 @@ AVCodec ff_escape130_decoder = {
.close = escape130_decode_close,
.decode = escape130_decode_frame,
.capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Escape 130"),
+ .long_name = NULL_IF_CONFIG_SMALL("Escape 130"),
};
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index f59bb23..44ef911 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -2067,7 +2067,15 @@ AVCodec ff_ffv1_encoder = {
.encode2 = encode_frame,
.close = common_end,
.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"),
.priv_class = &class,
};
diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c
index f635986..cabd621 100644
--- a/libavcodec/j2kenc.c
+++ b/libavcodec/j2kenc.c
@@ -1052,9 +1052,11 @@ AVCodec ff_jpeg2000_encoder = {
.close = j2kenc_destroy,
.capabilities = CODEC_CAP_EXPERIMENTAL,
.long_name = NULL_IF_CONFIG_SMALL("JPEG 2000"),
- .pix_fmts = (const enum PixelFormat[]) { PIX_FMT_RGB24, PIX_FMT_YUV444P, PIX_FMT_GRAY8,
-/* PIX_FMT_YUV420P,
- PIX_FMT_YUV422P, PIX_FMT_YUV444P,
- PIX_FMT_YUV410P, PIX_FMT_YUV411P,*/
- PIX_FMT_NONE }
+ .pix_fmts = (const enum PixelFormat[]) {
+ PIX_FMT_RGB24, PIX_FMT_YUV444P, PIX_FMT_GRAY8,
+/* PIX_FMT_YUV420P,
+ PIX_FMT_YUV422P, PIX_FMT_YUV444P,
+ PIX_FMT_YUV410P, PIX_FMT_YUV411P,*/
+ PIX_FMT_NONE
+ }
};
diff --git a/libavcodec/libaacplus.c b/libavcodec/libaacplus.c
index 0144ac1..4384d4e 100644
--- a/libavcodec/libaacplus.c
+++ b/libavcodec/libaacplus.c
@@ -137,6 +137,7 @@ AVCodec ff_libaacplus_encoder = {
.init = aacPlus_encode_init,
.encode2 = aacPlus_encode_frame,
.close = aacPlus_encode_close,
- .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE},
- .long_name = NULL_IF_CONFIG_SMALL("libaacplus AAC+ (Advanced Audio Codec with SBR+PS)"),
+ .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
+ AV_SAMPLE_FMT_NONE },
+ .long_name = NULL_IF_CONFIG_SMALL("libaacplus AAC+ (Advanced Audio Codec with SBR+PS)"),
};
diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c
index 4fd942e..5bd1f9c 100644
--- a/libavcodec/libopenjpegenc.c
+++ b/libavcodec/libopenjpegenc.c
@@ -452,15 +452,17 @@ AVCodec ff_libopenjpeg_encoder = {
.encode2 = libopenjpeg_encode_frame,
.close = libopenjpeg_encode_close,
.capabilities = 0,
- .pix_fmts = (const enum PixelFormat[]){PIX_FMT_RGB24,PIX_FMT_RGBA,PIX_FMT_RGB48,PIX_FMT_RGBA64,
- PIX_FMT_GRAY8,PIX_FMT_GRAY8A,PIX_FMT_GRAY16,
- PIX_FMT_YUV420P,PIX_FMT_YUV422P,PIX_FMT_YUVA420P,
- PIX_FMT_YUV440P,PIX_FMT_YUV444P,PIX_FMT_YUVA422P,
- PIX_FMT_YUV411P,PIX_FMT_YUV410P,PIX_FMT_YUVA444P,
- PIX_FMT_YUV420P9,PIX_FMT_YUV422P9,PIX_FMT_YUV444P9,
- PIX_FMT_YUV420P10,PIX_FMT_YUV422P10,PIX_FMT_YUV444P10,
- PIX_FMT_YUV420P16,PIX_FMT_YUV422P16,PIX_FMT_YUV444P16,
- PIX_FMT_NONE},
- .long_name = NULL_IF_CONFIG_SMALL("OpenJPEG JPEG 2000"),
+ .pix_fmts = (const enum PixelFormat[]){
+ PIX_FMT_RGB24, PIX_FMT_RGBA, PIX_FMT_RGB48, PIX_FMT_RGBA64,
+ PIX_FMT_GRAY8, PIX_FMT_GRAY8A, PIX_FMT_GRAY16,
+ PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_YUVA420P,
+ PIX_FMT_YUV440P, PIX_FMT_YUV444P, PIX_FMT_YUVA422P,
+ PIX_FMT_YUV411P, PIX_FMT_YUV410P, PIX_FMT_YUVA444P,
+ PIX_FMT_YUV420P9, PIX_FMT_YUV422P9, PIX_FMT_YUV444P9,
+ PIX_FMT_YUV420P10, PIX_FMT_YUV422P10, PIX_FMT_YUV444P10,
+ PIX_FMT_YUV420P16, PIX_FMT_YUV422P16, PIX_FMT_YUV444P16,
+ PIX_FMT_NONE
+ },
+ .long_name = NULL_IF_CONFIG_SMALL("OpenJPEG JPEG 2000"),
.priv_class = &class,
};
diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c
index 53a45b4..7eb4a52 100644
--- a/libavcodec/mjpegenc.c
+++ b/libavcodec/mjpegenc.c
@@ -499,6 +499,8 @@ AVCodec ff_amv_encoder = {
.init = ff_MPV_encode_init,
.encode2 = amv_encode_picture,
.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"),
};
More information about the ffmpeg-cvslog
mailing list