Commit 79216a18 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '733f4b05'

* commit '733f4b05':
  avplay: Check format allocation inside decode_thread()
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 32b2b7bd 733f4b05
......@@ -2884,6 +2884,11 @@ static int read_thread(void *arg)
is->eof = 0;
ic = avformat_alloc_context();
if (!ic) {
av_log(NULL, AV_LOG_FATAL, "Could not allocate context.\n");
ret = AVERROR(ENOMEM);
goto fail;
}
ic->interrupt_callback.callback = decode_interrupt_cb;
ic->interrupt_callback.opaque = is;
if (!av_dict_get(format_opts, "scan_all_pmts", NULL, AV_DICT_MATCH_CASE)) {
......
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