remove empty write trailer functions
patch by Vitor: [vitor1001 gmail com] Originally committed as revision 9442 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
4513cd48ee
commit
7cf0999529
@ -89,11 +89,6 @@ static int adts_write_frame_header(AVFormatContext *s, int size)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int adts_write_trailer(AVFormatContext *s)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int adts_write_packet(AVFormatContext *s, AVPacket *pkt)
|
||||
{
|
||||
ADTSContext *adts = s->priv_data;
|
||||
@ -119,5 +114,4 @@ AVOutputFormat adts_muxer = {
|
||||
CODEC_ID_NONE,
|
||||
adts_write_header,
|
||||
adts_write_packet,
|
||||
adts_write_trailer,
|
||||
};
|
||||
|
@ -60,11 +60,6 @@ static int amr_write_packet(AVFormatContext *s, AVPacket *pkt)
|
||||
put_flush_packet(&s->pb);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int amr_write_trailer(AVFormatContext *s)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
#endif /* CONFIG_MUXERS */
|
||||
|
||||
static int amr_probe(AVProbeData *p)
|
||||
@ -194,6 +189,5 @@ AVOutputFormat amr_muxer = {
|
||||
CODEC_ID_NONE,
|
||||
amr_write_header,
|
||||
amr_write_packet,
|
||||
amr_write_trailer,
|
||||
};
|
||||
#endif
|
||||
|
@ -62,11 +62,6 @@ static int raw_write_packet(struct AVFormatContext *s, AVPacket *pkt)
|
||||
put_flush_packet(&s->pb);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int raw_write_trailer(struct AVFormatContext *s)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
#endif //CONFIG_MUXERS
|
||||
|
||||
/* raw input */
|
||||
@ -481,7 +476,6 @@ AVOutputFormat flac_muxer = {
|
||||
0,
|
||||
flac_write_header,
|
||||
raw_write_packet,
|
||||
raw_write_trailer,
|
||||
.flags= AVFMT_NOTIMESTAMPS,
|
||||
};
|
||||
#endif //CONFIG_MUXERS
|
||||
@ -511,7 +505,6 @@ AVOutputFormat ac3_muxer = {
|
||||
0,
|
||||
raw_write_header,
|
||||
raw_write_packet,
|
||||
raw_write_trailer,
|
||||
.flags= AVFMT_NOTIMESTAMPS,
|
||||
};
|
||||
#endif //CONFIG_MUXERS
|
||||
@ -552,7 +545,6 @@ AVOutputFormat roq_muxer =
|
||||
CODEC_ID_ROQ,
|
||||
roq_write_header,
|
||||
raw_write_packet,
|
||||
raw_write_trailer,
|
||||
};
|
||||
#endif //CONFIG_ROQ_MUXER
|
||||
|
||||
@ -580,7 +572,6 @@ AVOutputFormat h261_muxer = {
|
||||
CODEC_ID_H261,
|
||||
raw_write_header,
|
||||
raw_write_packet,
|
||||
raw_write_trailer,
|
||||
.flags= AVFMT_NOTIMESTAMPS,
|
||||
};
|
||||
#endif //CONFIG_MUXERS
|
||||
@ -609,7 +600,6 @@ AVOutputFormat h263_muxer = {
|
||||
CODEC_ID_H263,
|
||||
raw_write_header,
|
||||
raw_write_packet,
|
||||
raw_write_trailer,
|
||||
.flags= AVFMT_NOTIMESTAMPS,
|
||||
};
|
||||
#endif //CONFIG_MUXERS
|
||||
@ -638,7 +628,6 @@ AVOutputFormat m4v_muxer = {
|
||||
CODEC_ID_MPEG4,
|
||||
raw_write_header,
|
||||
raw_write_packet,
|
||||
raw_write_trailer,
|
||||
.flags= AVFMT_NOTIMESTAMPS,
|
||||
};
|
||||
#endif //CONFIG_MUXERS
|
||||
@ -667,7 +656,6 @@ AVOutputFormat h264_muxer = {
|
||||
CODEC_ID_H264,
|
||||
raw_write_header,
|
||||
raw_write_packet,
|
||||
raw_write_trailer,
|
||||
.flags= AVFMT_NOTIMESTAMPS,
|
||||
};
|
||||
#endif //CONFIG_MUXERS
|
||||
@ -695,7 +683,6 @@ AVOutputFormat mpeg1video_muxer = {
|
||||
CODEC_ID_MPEG1VIDEO,
|
||||
raw_write_header,
|
||||
raw_write_packet,
|
||||
raw_write_trailer,
|
||||
.flags= AVFMT_NOTIMESTAMPS,
|
||||
};
|
||||
#endif //CONFIG_MUXERS
|
||||
@ -711,7 +698,6 @@ AVOutputFormat mpeg2video_muxer = {
|
||||
CODEC_ID_MPEG2VIDEO,
|
||||
raw_write_header,
|
||||
raw_write_packet,
|
||||
raw_write_trailer,
|
||||
.flags= AVFMT_NOTIMESTAMPS,
|
||||
};
|
||||
#endif //CONFIG_MUXERS
|
||||
@ -753,7 +739,6 @@ AVOutputFormat mjpeg_muxer = {
|
||||
CODEC_ID_MJPEG,
|
||||
raw_write_header,
|
||||
raw_write_packet,
|
||||
raw_write_trailer,
|
||||
.flags= AVFMT_NOTIMESTAMPS,
|
||||
};
|
||||
#endif //CONFIG_MUXERS
|
||||
@ -798,7 +783,6 @@ AVOutputFormat pcm_ ## name ## _muxer = {\
|
||||
0,\
|
||||
raw_write_header,\
|
||||
raw_write_packet,\
|
||||
raw_write_trailer,\
|
||||
.flags= AVFMT_NOTIMESTAMPS,\
|
||||
};
|
||||
|
||||
@ -896,7 +880,6 @@ AVOutputFormat rawvideo_muxer = {
|
||||
CODEC_ID_RAWVIDEO,
|
||||
raw_write_header,
|
||||
raw_write_packet,
|
||||
raw_write_trailer,
|
||||
.flags= AVFMT_NOTIMESTAMPS,
|
||||
};
|
||||
#endif //CONFIG_MUXERS
|
||||
@ -921,7 +904,6 @@ AVOutputFormat null_muxer = {
|
||||
CODEC_ID_RAWVIDEO,
|
||||
raw_write_header,
|
||||
null_write_packet,
|
||||
raw_write_trailer,
|
||||
.flags = AVFMT_NOFILE | AVFMT_RAWPICTURE | AVFMT_NOTIMESTAMPS,
|
||||
};
|
||||
#endif //CONFIG_MUXERS
|
||||
|
@ -1055,12 +1055,6 @@ static int rtp_write_packet(AVFormatContext *s1, AVPacket *pkt)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int rtp_write_trailer(AVFormatContext *s1)
|
||||
{
|
||||
// RTPDemuxContext *s = s1->priv_data;
|
||||
return 0;
|
||||
}
|
||||
|
||||
AVOutputFormat rtp_muxer = {
|
||||
"rtp",
|
||||
"RTP output format",
|
||||
@ -1071,5 +1065,4 @@ AVOutputFormat rtp_muxer = {
|
||||
CODEC_ID_NONE,
|
||||
rtp_write_header,
|
||||
rtp_write_packet,
|
||||
rtp_write_trailer,
|
||||
};
|
||||
|
@ -166,11 +166,6 @@ static int yuv4_write_header(AVFormatContext *s)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int yuv4_write_trailer(AVFormatContext *s)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_YUV4MPEGPIPE_MUXER
|
||||
AVOutputFormat yuv4mpegpipe_muxer = {
|
||||
"yuv4mpegpipe",
|
||||
@ -182,7 +177,6 @@ AVOutputFormat yuv4mpegpipe_muxer = {
|
||||
CODEC_ID_RAWVIDEO,
|
||||
yuv4_write_header,
|
||||
yuv4_write_packet,
|
||||
yuv4_write_trailer,
|
||||
.flags = AVFMT_RAWPICTURE,
|
||||
};
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user