* commit 'cf83c0173917a44b89a25ea2b435429bbf9ee767':
avplay: Always free find_stream_info options
Conflicts:
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
... | ... |
@@ -2888,15 +2888,17 @@ static int read_thread(void *arg) |
2888 | 2888 |
orig_nb_streams = ic->nb_streams; |
2889 | 2889 |
|
2890 | 2890 |
err = avformat_find_stream_info(ic, opts); |
2891 |
+ |
|
2892 |
+ for (i = 0; i < orig_nb_streams; i++) |
|
2893 |
+ av_dict_free(&opts[i]); |
|
2894 |
+ av_freep(&opts); |
|
2895 |
+ |
|
2891 | 2896 |
if (err < 0) { |
2892 | 2897 |
av_log(NULL, AV_LOG_WARNING, |
2893 | 2898 |
"%s: could not find codec parameters\n", is->filename); |
2894 | 2899 |
ret = -1; |
2895 | 2900 |
goto fail; |
2896 | 2901 |
} |
2897 |
- for (i = 0; i < orig_nb_streams; i++) |
|
2898 |
- av_dict_free(&opts[i]); |
|
2899 |
- av_freep(&opts); |
|
2900 | 2902 |
|
2901 | 2903 |
if (ic->pb) |
2902 | 2904 |
ic->pb->eof_reached = 0; // FIXME hack, ffplay maybe should not use avio_feof() to test for the end |