virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

cosmetics: align fields, and remove useless ones, in img2.c

Browse Source 
Originally committed as revision 25539 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Pascal Massimino 2010-10-21 22:07:00 +00:00
parent fc068f9f27
commit 85f56757b4
1 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
libavformat/img2.c
View File

@ -413,51 +413,47 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
/* input */ /* input */
#if CONFIG_IMAGE2_DEMUXER #if CONFIG_IMAGE2_DEMUXER
AVInputFormat image2_demuxer = { AVInputFormat image2_demuxer = {
.name = "image2", .name = "image2",
.long_name = NULL_IF_CONFIG_SMALL("image2 sequence"), .long_name = NULL_IF_CONFIG_SMALL("image2 sequence"),
.priv_data_size = sizeof(VideoData), .priv_data_size = sizeof(VideoData),
.read_probe = read_probe, .read_probe = read_probe,
.read_header = read_header, .read_header = read_header,
.read_packet = read_packet, .read_packet = read_packet,
.flags = AVFMT_NOFILE, .flags = AVFMT_NOFILE,
}; };
#endif #endif
#if CONFIG_IMAGE2PIPE_DEMUXER #if CONFIG_IMAGE2PIPE_DEMUXER
AVInputFormat image2pipe_demuxer = { AVInputFormat image2pipe_demuxer = {
.name = "image2pipe", .name = "image2pipe",
.long_name = NULL_IF_CONFIG_SMALL("piped image2 sequence"), .long_name = NULL_IF_CONFIG_SMALL("piped image2 sequence"),
.priv_data_size = sizeof(VideoData), .priv_data_size = sizeof(VideoData),
.read_header = read_header, .read_header = read_header,
.read_packet = read_packet, .read_packet = read_packet,
}; };
#endif #endif
/* output */ /* output */
#if CONFIG_IMAGE2_MUXER #if CONFIG_IMAGE2_MUXER
AVOutputFormat image2_muxer = { AVOutputFormat image2_muxer = {
.name = "image2", .name = "image2",
.long_name = NULL_IF_CONFIG_SMALL("image2 sequence"), .long_name = NULL_IF_CONFIG_SMALL("image2 sequence"),
.mime_type = "", .extensions = "bmp,jpeg,jpg,ljpg,pam,pbm,pcx,pgm,pgmyuv,png,"
.extensions = "bmp,jpeg,jpg,ljpg,pam,pbm,pcx,pgm,pgmyuv,png,ppm,sgi,tga,tif,tiff,jp2", "ppm,sgi,tga,tif,tiff,jp2",
.priv_data_size = sizeof(VideoData), .priv_data_size = sizeof(VideoData),
.audio_codec = CODEC_ID_NONE, .video_codec = CODEC_ID_MJPEG,
.video_codec = CODEC_ID_MJPEG, .write_header = write_header,
.write_header = write_header, .write_packet = write_packet,
.write_packet = write_packet, .flags = AVFMT_NOTIMESTAMPS | AVFMT_NODIMENSIONS | AVFMT_NOFILE
.flags = AVFMT_NOTIMESTAMPS | AVFMT_NODIMENSIONS | AVFMT_NOFILE
}; };
#endif #endif
#if CONFIG_IMAGE2PIPE_MUXER #if CONFIG_IMAGE2PIPE_MUXER
AVOutputFormat image2pipe_muxer = { AVOutputFormat image2pipe_muxer = {
.name = "image2pipe", .name = "image2pipe",
.long_name = NULL_IF_CONFIG_SMALL("piped image2 sequence"), .long_name = NULL_IF_CONFIG_SMALL("piped image2 sequence"),
.mime_type = "",
.extensions = "",
.priv_data_size = sizeof(VideoData), .priv_data_size = sizeof(VideoData),
.audio_codec = CODEC_ID_NONE, .video_codec = CODEC_ID_MJPEG,
.video_codec = CODEC_ID_MJPEG, .write_header = write_header,
.write_header = write_header, .write_packet = write_packet,
.write_packet = write_packet, .flags = AVFMT_NOTIMESTAMPS | AVFMT_NODIMENSIONS
.flags = AVFMT_NOTIMESTAMPS | AVFMT_NODIMENSIONS
}; };
#endif #endif