virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

avformat/mux: Only prepare input packet if there is a packet

Browse Source 
It is unnecessary to call prepare_input_packet if there is no packet as
it doesn't do anything, except when the currently inactive code guarded
by !FF_API_COMPUTE_PKT_FIELDS2 || !FF_API_LAVF_AVCTX becomes active:
Then attempting to access pkt->stream_index will crash.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2019-08-09 03:19:42 +02:00
parent a500b975a8
commit f4190a49ae
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavformat/mux.c
View File

@ -771,9 +771,6 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
static int check_packet(AVFormatContext *s, AVPacket *pkt) static int check_packet(AVFormatContext *s, AVPacket *pkt)
{ {
if (!pkt)
return 0;
if (pkt->stream_index < 0 || pkt->stream_index >= s->nb_streams) { if (pkt->stream_index < 0 || pkt->stream_index >= s->nb_streams) {
av_log(s, AV_LOG_ERROR, "Invalid packet stream index: %d\n", av_log(s, AV_LOG_ERROR, "Invalid packet stream index: %d\n",
pkt->stream_index); pkt->stream_index);
@ -887,10 +884,6 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt)
{ {
int ret; int ret;
ret = prepare_input_packet(s, pkt);
if (ret < 0)
return ret;
if (!pkt) { if (!pkt) {
if (s->oformat->flags & AVFMT_ALLOW_FLUSH) { if (s->oformat->flags & AVFMT_ALLOW_FLUSH) {
ret = s->oformat->write_packet(s, NULL); ret = s->oformat->write_packet(s, NULL);
@ -902,6 +895,10 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt)
return 1; return 1;
} }
ret = prepare_input_packet(s, pkt);
if (ret < 0)
return ret;
ret = do_packet_auto_bsf(s, pkt); ret = do_packet_auto_bsf(s, pkt);
if (ret <= 0) if (ret <= 0)
return ret; return ret;
@ -1191,13 +1188,13 @@ int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt)
{ {
int ret, flush = 0; int ret, flush = 0;
ret = prepare_input_packet(s, pkt);
if (ret < 0)
goto fail;
if (pkt) { if (pkt) {
AVStream *st = s->streams[pkt->stream_index]; AVStream *st = s->streams[pkt->stream_index];
ret = prepare_input_packet(s, pkt);
if (ret < 0)
goto fail;
ret = do_packet_auto_bsf(s, pkt); ret = do_packet_auto_bsf(s, pkt);
if (ret == 0) if (ret == 0)
return 0; return 0;