summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorSteven Liu <lingjiujianke@gmail.com>2016-07-14 06:37:02 +0800
committerMichael Niedermayer <michael@niedermayer.cc>2016-07-14 21:33:19 +0200
commite29d2d9c92e19b0caf05a2064d132ccdecdfc3d5 (patch)
treebf62bd7179d8df62659302dd3ed1d3ba22bd958e /libavformat
parent2c138b2c9b0ec92d9baf704498b1a32a989d03c5 (diff)
avformat/segment: remove the check_bitstream from segment
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>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/segment.c21
1 files changed, 0 insertions, 21 deletions
diff --git a/libavformat/segment.c b/libavformat/segment.c
index 4c6c6d448f..bf29ef8aa0 100644
--- a/libavformat/segment.c
+++ b/libavformat/segment.c
@@ -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,
};