Commit 019ff7a0 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'cf83c017'

* commit 'cf83c017':
  avplay: Always free find_stream_info options

Conflicts:
	ffplay.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents c40a1bd2 cf83c017
...@@ -2888,15 +2888,17 @@ static int read_thread(void *arg) ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment