diff options
| author | Lukasz Marek <lukasz.m.luki@gmail.com> | 2014-02-12 21:16:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-13 01:29:01 +0100 |
| commit | 9c3478c2343424907b0d8c88da917c56a4cd9162 (patch) | |
| tree | 116dcdec77fbdf958434aaef455822f8926cdebe /tools | |
| parent | e03c1af55eae6549dfd97a328eb3297faacc3a78 (diff) | |
| download | ffmpeg-streaming-9c3478c2343424907b0d8c88da917c56a4cd9162.zip ffmpeg-streaming-9c3478c2343424907b0d8c88da917c56a4cd9162.tar.gz | |
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>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/uncoded_frame.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/uncoded_frame.c b/tools/uncoded_frame.c index da04d06..eafbbfd 100644 --- a/tools/uncoded_frame.c +++ b/tools/uncoded_frame.c @@ -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; } } } |
