diff options
| author | Pascal Massimino <pascal.massimino@gmail.com> | 2010-10-21 22:07:00 +0000 |
|---|---|---|
| committer | Pascal Massimino <pascal.massimino@gmail.com> | 2010-10-21 22:07:00 +0000 |
| commit | 85f56757b44ff5505ed1053d760167c978345088 (patch) | |
| tree | 2d1cb4b3614429c738158c71be662b854f1c604b | |
| parent | fc068f9f2762bf7b24ced5d02b93f4d098b6ce23 (diff) | |
| download | ffmpeg-85f56757b44ff5505ed1053d760167c978345088.tar.gz | |
cosmetics: align fields, and remove useless ones, in img2.c
Originally committed as revision 25539 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/img2.c | 52 |
1 files changed, 24 insertions, 28 deletions
diff --git a/libavformat/img2.c b/libavformat/img2.c index 7d1cc07859..71f1dd0a1b 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -413,51 +413,47 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) /* input */ #if CONFIG_IMAGE2_DEMUXER AVInputFormat image2_demuxer = { - .name = "image2", - .long_name = NULL_IF_CONFIG_SMALL("image2 sequence"), + .name = "image2", + .long_name = NULL_IF_CONFIG_SMALL("image2 sequence"), .priv_data_size = sizeof(VideoData), - .read_probe = read_probe, - .read_header = read_header, - .read_packet = read_packet, - .flags = AVFMT_NOFILE, + .read_probe = read_probe, + .read_header = read_header, + .read_packet = read_packet, + .flags = AVFMT_NOFILE, }; #endif #if CONFIG_IMAGE2PIPE_DEMUXER AVInputFormat image2pipe_demuxer = { - .name = "image2pipe", - .long_name = NULL_IF_CONFIG_SMALL("piped image2 sequence"), + .name = "image2pipe", + .long_name = NULL_IF_CONFIG_SMALL("piped image2 sequence"), .priv_data_size = sizeof(VideoData), - .read_header = read_header, - .read_packet = read_packet, + .read_header = read_header, + .read_packet = read_packet, }; #endif /* output */ #if CONFIG_IMAGE2_MUXER AVOutputFormat image2_muxer = { - .name = "image2", - .long_name = NULL_IF_CONFIG_SMALL("image2 sequence"), - .mime_type = "", - .extensions = "bmp,jpeg,jpg,ljpg,pam,pbm,pcx,pgm,pgmyuv,png,ppm,sgi,tga,tif,tiff,jp2", + .name = "image2", + .long_name = NULL_IF_CONFIG_SMALL("image2 sequence"), + .extensions = "bmp,jpeg,jpg,ljpg,pam,pbm,pcx,pgm,pgmyuv,png," + "ppm,sgi,tga,tif,tiff,jp2", .priv_data_size = sizeof(VideoData), - .audio_codec = CODEC_ID_NONE, - .video_codec = CODEC_ID_MJPEG, - .write_header = write_header, - .write_packet = write_packet, - .flags = AVFMT_NOTIMESTAMPS | AVFMT_NODIMENSIONS | AVFMT_NOFILE + .video_codec = CODEC_ID_MJPEG, + .write_header = write_header, + .write_packet = write_packet, + .flags = AVFMT_NOTIMESTAMPS | AVFMT_NODIMENSIONS | AVFMT_NOFILE }; #endif #if CONFIG_IMAGE2PIPE_MUXER AVOutputFormat image2pipe_muxer = { - .name = "image2pipe", - .long_name = NULL_IF_CONFIG_SMALL("piped image2 sequence"), - .mime_type = "", - .extensions = "", + .name = "image2pipe", + .long_name = NULL_IF_CONFIG_SMALL("piped image2 sequence"), .priv_data_size = sizeof(VideoData), - .audio_codec = CODEC_ID_NONE, - .video_codec = CODEC_ID_MJPEG, - .write_header = write_header, - .write_packet = write_packet, - .flags = AVFMT_NOTIMESTAMPS | AVFMT_NODIMENSIONS + .video_codec = CODEC_ID_MJPEG, + .write_header = write_header, + .write_packet = write_packet, + .flags = AVFMT_NOTIMESTAMPS | AVFMT_NODIMENSIONS }; #endif |