Merge commit 'a8765852158ecb2ae34895fa35ff51dc95c186f9'

[ffmpeg] / ffplay.c

diff --git a/ffplay.c b/ffplay.c
index 8c62f9cf3e86ef0c1dbb7d594af7946e6e08e5ca..8140dd9645010f794d24267543f3131eeb3a0bf9 100644 (file)
--- a/ffplay.c
+++ b/ffplay.c
@@ -2230,6 +2230,9 @@ static int video_thread(void *arg)
     int last_vfilter_idx = 0;
 #endif
 
+    if (!frame)
+        return AVERROR(ENOMEM);
+
     for (;;) {
         ret = get_video_frame(is, frame);
         if (ret < 0)
@@ -2881,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)) {