mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-10 09:31:06 +02:00
Merge commit '19133e96d30e3f80dbae236ef081aedef419a6bf'
* commit '19133e96d30e3f80dbae236ef081aedef419a6bf': lavf: fix memleaks in avformat_find_stream_info() Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
a2d5f6b9db
@ -3197,6 +3197,8 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
|
||||
av_log(ic, AV_LOG_VERBOSE, "max_analyze_duration %"PRId64" reached at %"PRId64" microseconds\n",
|
||||
max_analyze_duration,
|
||||
t);
|
||||
if (ic->flags & AVFMT_FLAG_NOBUFFER)
|
||||
av_packet_unref(pkt);
|
||||
break;
|
||||
}
|
||||
if (pkt->duration) {
|
||||
@ -3230,6 +3232,9 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
|
||||
try_decode_frame(ic, st, pkt,
|
||||
(options && i < orig_nb_streams) ? &options[i] : NULL);
|
||||
|
||||
if (ic->flags & AVFMT_FLAG_NOBUFFER)
|
||||
av_packet_unref(pkt);
|
||||
|
||||
st->codec_info_nb_frames++;
|
||||
count++;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user