ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-20 05:16:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup image2pipe_{de}muxer fields

Browse Source 
Originally committed as revision 25531 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Pascal Massimino 2010-10-21 00:57:53 +00:00
parent 96ea6ad2a7
commit ac6d020ffa
1 changed files with 37 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
libavformat/img2.c
View File

@ -171,7 +171,7 @@ static int find_image_range(int *pfirst_index, int *plast_index,
}
static int image_probe(AVProbeData *p)
static int read_probe(AVProbeData *p)
{
if (p->filename && av_str2id(img_tags, p->filename)) {
if (av_filename_number_test(p->filename))
@ -186,7 +186,7 @@ enum CodecID av_guess_image2_codec(const char *filename){
return av_str2id(img_tags, filename);
}
static int img_read_header(AVFormatContext *s1, AVFormatParameters *ap)
static int read_header(AVFormatContext *s1, AVFormatParameters *ap)
{
VideoData *s = s1->priv_data;
int first_index, last_index;
@ -249,7 +249,7 @@ static int img_read_header(AVFormatContext *s1, AVFormatParameters *ap)
return 0;
}
static int img_read_packet(AVFormatContext *s1, AVPacket *pkt)
static int read_packet(AVFormatContext *s1, AVPacket *pkt)
{
VideoData *s = s1->priv_data;
char filename[1024];
@ -320,7 +320,7 @@ static int img_read_packet(AVFormatContext *s1, AVPacket *pkt)
/******************************************************/
/* image output */
static int img_write_header(AVFormatContext *s)
static int write_header(AVFormatContext *s)
{
VideoData *img = s->priv_data;
@ -336,7 +336,7 @@ static int img_write_header(AVFormatContext *s)
return 0;
}
static int img_write_packet(AVFormatContext *s, AVPacket *pkt)
static int write_packet(AVFormatContext *s, AVPacket *pkt)
{
VideoData *img = s->priv_data;
ByteIOContext *pb[3];
@ -413,56 +413,51 @@ static int img_write_packet(AVFormatContext *s, AVPacket *pkt)
/* input */
#if CONFIG_IMAGE2_DEMUXER
AVInputFormat image2_demuxer = {
"image2",
NULL_IF_CONFIG_SMALL("image2 sequence"),
sizeof(VideoData),
image_probe,
img_read_header,
img_read_packet,
NULL,
NULL,
NULL,
AVFMT_NOFILE,
.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,
};
#endif
#if CONFIG_IMAGE2PIPE_DEMUXER
AVInputFormat image2pipe_demuxer = {
"image2pipe",
NULL_IF_CONFIG_SMALL("piped image2 sequence"),
sizeof(VideoData),
NULL, /* no probe */
img_read_header,
img_read_packet,
.name = "image2pipe",
.long_name = NULL_IF_CONFIG_SMALL("piped image2 sequence"),
.priv_data_size = sizeof(VideoData),
.read_header = read_header,
.read_packet = read_packet,
};
#endif
/* output */
#if CONFIG_IMAGE2_MUXER
AVOutputFormat image2_muxer = {
"image2",
NULL_IF_CONFIG_SMALL("image2 sequence"),
"",
"bmp,jpeg,jpg,ljpg,pam,pbm,pcx,pgm,pgmyuv,png,ppm,sgi,tga,tif,tiff,jp2",
sizeof(VideoData),
CODEC_ID_NONE,
CODEC_ID_MJPEG,
img_write_header,
img_write_packet,
NULL,
.flags= AVFMT_NOTIMESTAMPS | AVFMT_NODIMENSIONS | AVFMT_NOFILE
.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",
.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
};
#endif
#if CONFIG_IMAGE2PIPE_MUXER
AVOutputFormat image2pipe_muxer = {
"image2pipe",
NULL_IF_CONFIG_SMALL("piped image2 sequence"),
"",
"",
sizeof(VideoData),
CODEC_ID_NONE,
CODEC_ID_MJPEG,
img_write_header,
img_write_packet,
.flags= AVFMT_NOTIMESTAMPS | AVFMT_NODIMENSIONS
.name = "image2pipe",
.long_name = NULL_IF_CONFIG_SMALL("piped image2 sequence"),
.mime_type = "",
.extensions = "",
.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
};
#endif