GitList

Browse code

Merge commit '733f4b05f0e120ddd0393b23f2b6d9106cf922e4'

* commit '733f4b05f0e120ddd0393b23f2b6d9106cf922e4':
avplay: Check format allocation inside decode_thread()

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Michael Niedermayer authored on 2015/02/18 05:16:22
Showing 1 changed files

ffplay.c

History View file @ 79216a1

@@ -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)) {