highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'cf83c0173917a44b89a25ea2b435429bbf9ee767'

Browse Source 
* commit 'cf83c0173917a44b89a25ea2b435429bbf9ee767':
  avplay: Always free find_stream_info options

Conflicts:
	ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-10-17 13:17:05 +02:00
commit 019ff7a0c3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ffplay.c
View File

@ -2888,15 +2888,17 @@ static int read_thread(void *arg)
orig_nb_streams = ic->nb_streams; orig_nb_streams = ic->nb_streams;
err = avformat_find_stream_info(ic, opts); err = avformat_find_stream_info(ic, opts);
for (i = 0; i < orig_nb_streams; i++)
av_dict_free(&opts[i]);
av_freep(&opts);
if (err < 0) { if (err < 0) {
av_log(NULL, AV_LOG_WARNING, av_log(NULL, AV_LOG_WARNING,
"%s: could not find codec parameters\n", is->filename); "%s: could not find codec parameters\n", is->filename);
ret = -1; ret = -1;
goto fail; goto fail;
} }
for (i = 0; i < orig_nb_streams; i++)
av_dict_free(&opts[i]);
av_freep(&opts);
if (ic->pb) if (ic->pb)
ic->pb->eof_reached = 0; // FIXME hack, ffplay maybe should not use avio_feof() to test for the end ic->pb->eof_reached = 0; // FIXME hack, ffplay maybe should not use avio_feof() to test for the end