Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use more designated initializers.

Browse Source 
Also remove some pointless NULL/0 assigments.

C++ code must be left as it is because named struct
initializers are not supported by C++ standard.
pull/3/head
Paul B Mahol 13 years ago committed by Carl Eugen Hoyos
parent 73ba2c1e62
commit ba10207bbe
21 changed files with 107 additions and 131 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 51
      libavcodec/bintext.c
  2. 1
      libavcodec/diracdec.c
  3. 14
      libavcodec/flashsv2enc.c
  4. 14
      libavcodec/g729dec.c
  5. 15
      libavcodec/j2kdec.c
  6. 14
      libavcodec/j2kenc.c
  7. 14
      libavcodec/libaacplus.c
  8. 1
      libavcodec/libopenjpegenc.c
  9. 14
      libavcodec/msvideo1enc.c
  10. 2
      libavcodec/pictordec.c
  11. 1
      libavcodec/proresenc.c
  12. 45
      libavcodec/sonic.c
  13. 20
      libavformat/cafenc.c
  14. 1
      libavformat/crcenc.c
  15. 1
      libavformat/ffmenc.c
  16. 1
      libavformat/framecrcenc.c
  17. 10
      libavformat/g723_1.c
  18. 2
      libavformat/md5enc.c
  19. 15
      libavformat/mkvtimestamp_v2.c
  20. 1
      libavformat/vc1testenc.c
  21. 1
      libavformat/yuv4mpeg.c

51
libavcodec/bintext.c
Unescape View File

@ -211,40 +211,37 @@ static av_cold int decode_end(AVCodecContext *avctx)
}
AVCodec ff_bintext_decoder = {
"bintext",
AVMEDIA_TYPE_VIDEO,
CODEC_ID_BINTEXT,
sizeof(XbinContext),
decode_init,
NULL,
decode_end,
decode_frame,
CODEC_CAP_DR1,
.name = "bintext",
.type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_BINTEXT,
.priv_data_size = sizeof(XbinContext),
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
.capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("Binary text"),
};
AVCodec ff_xbin_decoder = {
"xbin",
AVMEDIA_TYPE_VIDEO,
CODEC_ID_XBIN,
sizeof(XbinContext),
decode_init,
NULL,
decode_end,
decode_frame,
CODEC_CAP_DR1,
.name = "xbin",
.type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_XBIN,
.priv_data_size = sizeof(XbinContext),
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
.capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("eXtended BINary text"),
};
AVCodec ff_idf_decoder = {
"idf",
AVMEDIA_TYPE_VIDEO,
CODEC_ID_IDF,
sizeof(XbinContext),
decode_init,
NULL,
decode_end,
decode_frame,
CODEC_CAP_DR1,
.name = "idf",
.type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_IDF,
.priv_data_size = sizeof(XbinContext),
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
.capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("iCEDraw text"),
};

1
libavcodec/diracdec.c
Unescape View File

@ -1898,7 +1898,6 @@ AVCodec ff_dirac_decoder = {
.id = CODEC_ID_DIRAC,
.priv_data_size = sizeof(DiracContext),
.init = dirac_decode_init,
.encode = NULL,
.close = dirac_decode_end,
.decode = dirac_decode_frame,
.capabilities = CODEC_CAP_DELAY,

14
libavcodec/flashsv2enc.c
Unescape View File

@ -894,13 +894,13 @@ static av_cold int flashsv2_encode_end(AVCodecContext * avctx)
}
AVCodec ff_flashsv2_encoder = {
"flashsv2",
AVMEDIA_TYPE_VIDEO,
CODEC_ID_FLASHSV2,
sizeof(FlashSV2Context),
flashsv2_encode_init,
flashsv2_encode_frame,
flashsv2_encode_end,
.name = "flashsv2",
.type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_FLASHSV2,
.priv_data_size = sizeof(FlashSV2Context),
.init = flashsv2_encode_init,
.encode = flashsv2_encode_frame,
.close = flashsv2_encode_end,
.pix_fmts = (enum PixelFormat[]) {PIX_FMT_BGR24, PIX_FMT_NONE},
.long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video Version 2"),
.capabilities = CODEC_CAP_EXPERIMENTAL,

14
libavcodec/g729dec.c
Unescape View File

@ -714,14 +714,12 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr,
AVCodec ff_g729_decoder =
{
"g729",
AVMEDIA_TYPE_AUDIO,
CODEC_ID_G729,
sizeof(G729Context),
decoder_init,
NULL,
NULL,
decode_frame,
.name = "g729",
.type = AVMEDIA_TYPE_AUDIO,
.id = 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"),
};

15
libavcodec/j2kdec.c
Unescape View File

@ -1068,14 +1068,13 @@ static av_cold int decode_end(AVCodecContext *avctx)
}
AVCodec ff_jpeg2000_decoder = {
"j2k",
AVMEDIA_TYPE_VIDEO,
CODEC_ID_JPEG2000,
sizeof(J2kDecoderContext),
j2kdec_init,
NULL,
decode_end,
decode_frame,
.name = "j2k",
.type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_JPEG2000,
.priv_data_size = sizeof(J2kDecoderContext),
.init = j2kdec_init,
.close = decode_end,
.decode = decode_frame,
.capabilities = CODEC_CAP_EXPERIMENTAL,
.long_name = NULL_IF_CONFIG_SMALL("JPEG 2000"),
.pix_fmts =

14
libavcodec/j2kenc.c
Unescape View File

@ -1036,13 +1036,13 @@ static int j2kenc_destroy(AVCodecContext *avctx)
}
AVCodec ff_jpeg2000_encoder = {
"j2k",
AVMEDIA_TYPE_VIDEO,
CODEC_ID_JPEG2000,
sizeof(J2kEncoderContext),
j2kenc_init,
encode_frame,
j2kenc_destroy,
.name = "j2k",
.type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_JPEG2000,
.priv_data_size = sizeof(J2kEncoderContext),
.init = j2kenc_init,
.encode = encode_frame,
.close = j2kenc_destroy,
.capabilities= CODEC_CAP_EXPERIMENTAL,
.long_name = NULL_IF_CONFIG_SMALL("JPEG 2000"),
.pix_fmts =

14
libavcodec/libaacplus.c
Unescape View File

@ -122,13 +122,13 @@ static av_cold int aacPlus_encode_close(AVCodecContext *avctx)
}
AVCodec ff_libaacplus_encoder = {
"libaacplus",
AVMEDIA_TYPE_AUDIO,
CODEC_ID_AAC,
sizeof(aacPlusAudioContext),
aacPlus_encode_init,
aacPlus_encode_frame,
aacPlus_encode_close,
.name = "libaacplus",
.type = AVMEDIA_TYPE_AUDIO,
.id = CODEC_ID_AAC,
.priv_data_size = sizeof(aacPlusAudioContext),
.init = aacPlus_encode_init,
.encode = aacPlus_encode_frame,
.close = aacPlus_encode_close,
.sample_fmts = (const enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE},
.long_name = NULL_IF_CONFIG_SMALL("libaacplus AAC+ (Advanced Audio Codec with SBR+PS)"),
};

1
libavcodec/libopenjpegenc.c
Unescape View File

@ -365,7 +365,6 @@ AVCodec ff_libopenjpeg_encoder = {
.init = libopenjpeg_encode_init,
.encode = libopenjpeg_encode_frame,
.close = libopenjpeg_encode_close,
.decode = NULL,
.capabilities = 0,
.pix_fmts = (const enum PixelFormat[]){PIX_FMT_RGB24,PIX_FMT_RGBA,PIX_FMT_GRAY8,
PIX_FMT_YUV420P,PIX_FMT_YUV422P,PIX_FMT_YUVA420P,

14
libavcodec/msvideo1enc.c
Unescape View File

@ -290,13 +290,13 @@ static av_cold int encode_end(AVCodecContext *avctx)
}
AVCodec ff_msvideo1_encoder = {
"msvideo1",
AVMEDIA_TYPE_VIDEO,
CODEC_ID_MSVIDEO1,
sizeof(Msvideo1EncContext),
encode_init,
encode_frame,
encode_end,
.name = "msvideo1",
.type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_MSVIDEO1,
.priv_data_size = sizeof(Msvideo1EncContext),
.init = encode_init,
.encode = encode_frame,
.close = encode_end,
.pix_fmts = (const enum PixelFormat[]){PIX_FMT_RGB555, PIX_FMT_NONE},
.long_name = NULL_IF_CONFIG_SMALL("Microsoft Video-1"),
};

2
libavcodec/pictordec.c
Unescape View File

@ -253,7 +253,7 @@ AVCodec ff_pictor_decoder = {
.type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_PICTOR,
.priv_data_size = sizeof(PicContext),
decode_init,
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
.capabilities = CODEC_CAP_DR1,

1
libavcodec/proresenc.c
Unescape View File

@ -594,6 +594,5 @@ AVCodec ff_prores_encoder = {
.encode = prores_encode_frame,
.pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV422P10, PIX_FMT_NONE},
.long_name = NULL_IF_CONFIG_SMALL("Apple ProRes"),
.capabilities = 0,
.profiles = profiles
};

45
libavcodec/sonic.c
Unescape View File

@ -936,42 +936,39 @@ static int sonic_decode_frame(AVCodecContext *avctx,
}
AVCodec ff_sonic_decoder = {
"sonic",
AVMEDIA_TYPE_AUDIO,
CODEC_ID_SONIC,
sizeof(SonicContext),
sonic_decode_init,
NULL,
sonic_decode_close,
sonic_decode_frame,
.name = "sonic",
.type = AVMEDIA_TYPE_AUDIO,
.id = CODEC_ID_SONIC,
.priv_data_size = sizeof(SonicContext),
.init = sonic_decode_init,
.close = sonic_decode_close,
.decode = sonic_decode_frame,
.long_name = NULL_IF_CONFIG_SMALL("Sonic"),
};
#endif /* CONFIG_SONIC_DECODER */
#if CONFIG_SONIC_ENCODER
AVCodec ff_sonic_encoder = {
"sonic",
AVMEDIA_TYPE_AUDIO,
CODEC_ID_SONIC,
sizeof(SonicContext),
sonic_encode_init,
sonic_encode_frame,
sonic_encode_close,
NULL,
.name = "sonic",
.type = AVMEDIA_TYPE_AUDIO,
.id = CODEC_ID_SONIC,
.priv_data_size = sizeof(SonicContext),
.init = sonic_encode_init,
.encode = sonic_encode_frame,
.close = sonic_encode_close,
.long_name = NULL_IF_CONFIG_SMALL("Sonic"),
};
#endif
#if CONFIG_SONIC_LS_ENCODER
AVCodec ff_sonic_ls_encoder = {
"sonicls",
AVMEDIA_TYPE_AUDIO,
CODEC_ID_SONIC_LS,
sizeof(SonicContext),
sonic_encode_init,
sonic_encode_frame,
sonic_encode_close,
NULL,
.name = "sonicls",
.type = AVMEDIA_TYPE_AUDIO,
.id = CODEC_ID_SONIC_LS,
.priv_data_size = sizeof(SonicContext),
.init = sonic_encode_init,
.encode = sonic_encode_frame,
.close = sonic_encode_close,
.long_name = NULL_IF_CONFIG_SMALL("Sonic lossless"),
};
#endif

20
libavformat/cafenc.c
Unescape View File

@ -248,15 +248,15 @@ static int caf_write_trailer(AVFormatContext *s)
}
AVOutputFormat ff_caf_muxer = {
"caf",
NULL_IF_CONFIG_SMALL("Apple Core Audio Format"),
"audio/x-caf",
"caf",
sizeof(CAFContext),
CODEC_ID_PCM_S16BE,
CODEC_ID_NONE,
caf_write_header,
caf_write_packet,
caf_write_trailer,
.name = "caf",
.long_name = NULL_IF_CONFIG_SMALL("Apple Core Audio Format"),
.mime_type = "audio/x-caf",
.extensions = "caf",
.priv_data_size = sizeof(CAFContext),
.audio_codec = CODEC_ID_PCM_S16BE,
.video_codec = CODEC_ID_NONE,
.write_header = caf_write_header,
.write_packet = caf_write_packet,
.write_trailer = caf_write_trailer,
.codec_tag= (const AVCodecTag* const []){ff_codec_caf_tags, 0},
};

1
libavformat/crcenc.c
Unescape View File

@ -57,7 +57,6 @@ static int crc_write_trailer(struct AVFormatContext *s)
AVOutputFormat ff_crc_muxer = {
.name = "crc",
.long_name = NULL_IF_CONFIG_SMALL("CRC testing format"),
.extensions = "",
.priv_data_size = sizeof(CRCState),
.audio_codec = CODEC_ID_PCM_S16LE,
.video_codec = CODEC_ID_RAWVIDEO,

1
libavformat/ffmenc.c
Unescape View File

@ -244,7 +244,6 @@ static int ffm_write_trailer(AVFormatContext *s)
AVOutputFormat ff_ffm_muxer = {
.name = "ffm",
.long_name = NULL_IF_CONFIG_SMALL("FFM (FFserver live feed) format"),
.mime_type = "",
.extensions = "ffm",
.priv_data_size = sizeof(FFMContext),
.audio_codec = CODEC_ID_MP2,

1
libavformat/framecrcenc.c
Unescape View File

@ -36,7 +36,6 @@ static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt)
AVOutputFormat ff_framecrc_muxer = {
.name = "framecrc",
.long_name = NULL_IF_CONFIG_SMALL("framecrc testing format"),
.extensions = "",
.audio_codec = CODEC_ID_PCM_S16LE,
.video_codec = CODEC_ID_RAWVIDEO,
.write_packet = framecrc_write_packet,

10
libavformat/g723_1.c
Unescape View File

@ -73,12 +73,10 @@ static int g723_1_read_packet(AVFormatContext *s, AVPacket *pkt)
}
AVInputFormat ff_g723_1_demuxer = {
"g723_1",
NULL_IF_CONFIG_SMALL("G.723.1 format"),
0,
NULL,
g723_1_init,
g723_1_read_packet,
.name = "g723_1",
.long_name = NULL_IF_CONFIG_SMALL("G.723.1 format"),
.read_header = g723_1_init,
.read_packet = g723_1_read_packet,
.extensions = "tco,rco",
.flags = AVFMT_GENERIC_INDEX
};

2
libavformat/md5enc.c
Unescape View File

@ -68,7 +68,6 @@ static int write_trailer(struct AVFormatContext *s)
AVOutputFormat ff_md5_muxer = {
.name = "md5",
.long_name = NULL_IF_CONFIG_SMALL("MD5 testing format"),
.extensions = "",
.priv_data_size = PRIVSIZE,
.audio_codec = CODEC_ID_PCM_S16LE,
.video_codec = CODEC_ID_RAWVIDEO,
@ -98,7 +97,6 @@ static int framemd5_write_packet(struct AVFormatContext *s, AVPacket *pkt)
AVOutputFormat ff_framemd5_muxer = {
.name = "framemd5",
.long_name = NULL_IF_CONFIG_SMALL("Per-frame MD5 testing format"),
.extensions = "",
.priv_data_size = PRIVSIZE,
.audio_codec = CODEC_ID_PCM_S16LE,
.video_codec = CODEC_ID_RAWVIDEO,

15
libavformat/mkvtimestamp_v2.c
Unescape View File

@ -42,13 +42,10 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
}
AVOutputFormat ff_mkvtimestamp_v2_muxer = {
"mkvtimestamp_v2",
NULL_IF_CONFIG_SMALL("extract pts as timecode v2 format, as defined by mkvtoolnix"),
NULL,
"",
0,
CODEC_ID_NONE,
CODEC_ID_RAWVIDEO,
write_header,
write_packet,
.name = "mkvtimestamp_v2",
.long_name = NULL_IF_CONFIG_SMALL("extract pts as timecode v2 format, as defined by mkvtoolnix"),
.audio_codec = CODEC_ID_NONE,
.video_codec = CODEC_ID_RAWVIDEO,
.write_header = write_header,
.write_packet = write_packet,
};

1
libavformat/vc1testenc.c
Unescape View File

@ -85,7 +85,6 @@ static int vc1test_write_trailer(AVFormatContext *s)
AVOutputFormat ff_vc1t_muxer = {
.name = "rcv",
.long_name = NULL_IF_CONFIG_SMALL("VC-1 test bitstream"),
.mime_type = "",
.extensions = "rcv",
.priv_data_size = sizeof(RCVContext),
.audio_codec = CODEC_ID_NONE,

1
libavformat/yuv4mpeg.c
Unescape View File

@ -181,7 +181,6 @@ static int yuv4_write_header(AVFormatContext *s)
AVOutputFormat ff_yuv4mpegpipe_muxer = {
.name = "yuv4mpegpipe",
.long_name = NULL_IF_CONFIG_SMALL("YUV4MPEG pipe format"),
.mime_type = "",
.extensions = "y4m",
.priv_data_size = sizeof(int),
.audio_codec = CODEC_ID_NONE,

Write Preview
Loading…
Cancel
Save