eden-emu/FFmpeg
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit '19133e96d3'

Browse source 
* commit '19133e96d3':
  lavf: fix memleaks in avformat_find_stream_info()

Conflicts:
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-09-29 21:25:09 +02:00
commit a2d5f6b9db
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libavformat/utils.c
View file

@ -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", av_log(ic, AV_LOG_VERBOSE, "max_analyze_duration %"PRId64" reached at %"PRId64" microseconds\n",
max_analyze_duration, max_analyze_duration,
t); t);
if (ic->flags & AVFMT_FLAG_NOBUFFER)
av_packet_unref(pkt);
break; break;
} }
if (pkt->duration) { if (pkt->duration) {
@ -3230,6 +3232,9 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
try_decode_frame(ic, st, pkt, try_decode_frame(ic, st, pkt,
(options && i < orig_nb_streams) ? &options[i] : NULL); (options && i < orig_nb_streams) ? &options[i] : NULL);
if (ic->flags & AVFMT_FLAG_NOBUFFER)
av_packet_unref(pkt);
st->codec_info_nb_frames++; st->codec_info_nb_frames++;
count++; count++;
} }