generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/segment: remove the check_bitstream from segment

Browse Source 
because the BSF logic was re-factored into a shareable
function and both av_write_frame and av_interleaved_write_frame use it it

Signed-off-by: LiuQi <liuqi@gosun.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Steven Liu 2016-07-14 06:37:02 +08:00 committed by Michael Niedermayer
parent 2c138b2c9b
commit e29d2d9c92
1 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavformat/segment.c
View File

@ -957,25 +957,6 @@ fail:
return ret;
}
static int seg_check_bitstream(struct AVFormatContext *s, const AVPacket *pkt)
{
SegmentContext *seg = s->priv_data;
AVFormatContext *oc = seg->avf;
if (oc->oformat->check_bitstream) {
int ret = oc->oformat->check_bitstream(oc, pkt);
if (ret == 1) {
AVStream *st = s->streams[pkt->stream_index];
AVStream *ost = oc->streams[pkt->stream_index];
st->internal->bsfcs = ost->internal->bsfcs;
st->internal->nb_bsfcs = ost->internal->nb_bsfcs;
ost->internal->bsfcs = NULL;
ost->internal->nb_bsfcs = 0;
}
return ret;
}
return 1;
}
#define OFFSET(x) offsetof(SegmentContext, x)
#define E AV_OPT_FLAG_ENCODING_PARAM
static const AVOption options[] = {
@ -1037,7 +1018,6 @@ AVOutputFormat ff_segment_muxer = {
.init = seg_init,
.write_packet = seg_write_packet,
.write_trailer = seg_write_trailer,
.check_bitstream = seg_check_bitstream,
.priv_class = &seg_class,
};
@ -1056,6 +1036,5 @@ AVOutputFormat ff_stream_segment_muxer = {
.init = seg_init,
.write_packet = seg_write_packet,
.write_trailer = seg_write_trailer,
.check_bitstream = seg_check_bitstream,
.priv_class = &sseg_class,
};