mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
tools/uncoded_frame: fix double free
in case av_interleaved_write_uncoded_frame fails it seems frame is freed for the second time in fail section. Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com> Reviewed-by: Nicolas George <george@nsup.org> This commit also removes 1 trailing whitespace as otherwise the push hook rejects it Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
e03c1af55e
commit
9c3478c234
@ -182,7 +182,7 @@ int main(int argc, char **argv)
|
||||
st->stream->codec->channel_layout = st->link->channel_layout;
|
||||
st->stream->codec->channels = avfilter_link_get_channels(st->link);
|
||||
st->stream->codec->sample_rate = st->link->sample_rate;
|
||||
st->stream->codec->sample_fmt = st->link->format;
|
||||
st->stream->codec->sample_fmt = st->link->format;
|
||||
break;
|
||||
default:
|
||||
av_assert0(!"reached");
|
||||
@ -245,12 +245,12 @@ int main(int argc, char **argv)
|
||||
ret = av_interleaved_write_uncoded_frame(st->mux,
|
||||
st->stream->index,
|
||||
frame);
|
||||
frame = NULL;
|
||||
if (ret < 0) {
|
||||
av_log(st->stream->codec, AV_LOG_ERROR,
|
||||
"Error writing frame: %s\n", av_err2str(ret));
|
||||
goto fail;
|
||||
}
|
||||
frame = NULL;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user