diff options
author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-05-16 02:04:34 +0200 |
---|---|---|
committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-05-16 02:55:59 +0200 |
commit | 718f05f5e5cfc38a5123deac7259f548b2f04751 (patch) | |
tree | 6747679b5a947f981251002578835c76ef3fd66c /libavformat/mux.c | |
parent | 39195896f31aef7e96f1e4748e569d930df9d0c9 (diff) | |
download | ffmpeg-718f05f5e5cfc38a5123deac7259f548b2f04751.tar.gz |
avformat/mux: Call check_packet() more directly
Call it directly from write_packets_common() instead of indirectly
through prepare_input_packet().
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavformat/mux.c')
-rw-r--r-- | libavformat/mux.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/libavformat/mux.c b/libavformat/mux.c index f2de73af9b..b08d48b5fb 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -759,16 +759,8 @@ static int check_packet(AVFormatContext *s, AVPacket *pkt) return 0; } -static int prepare_input_packet(AVFormatContext *s, AVPacket *pkt) +static int prepare_input_packet(AVFormatContext *s, AVStream *st, AVPacket *pkt) { - AVStream *st; - int ret; - - ret = check_packet(s, pkt); - if (ret < 0) - return ret; - st = s->streams[pkt->stream_index]; - #if !FF_API_COMPUTE_PKT_FIELDS2 || !FF_API_LAVF_AVCTX /* sanitize the timestamps */ if (!(s->oformat->flags & AVFMT_NOTIMESTAMPS)) { @@ -1178,11 +1170,15 @@ static int write_packets_from_bsfs(AVFormatContext *s, AVStream *st, AVPacket *p static int write_packets_common(AVFormatContext *s, AVPacket *pkt, int interleaved) { AVStream *st; - int ret = prepare_input_packet(s, pkt); + int ret = check_packet(s, pkt); if (ret < 0) return ret; st = s->streams[pkt->stream_index]; + ret = prepare_input_packet(s, st, pkt); + if (ret < 0) + return ret; + ret = check_bitstream(s, st, pkt); if (ret < 0) return ret; |