From 683a4253402726f818087402bf15643cd4ebcd51 Mon Sep 17 00:00:00 2001
From: Zhang Rui <bbcallen@gmail.com>
Date: Tue, 7 Apr 2015 19:42:52 +0800
Subject: [PATCH] ff_ffplay: merge: a821617b5a09321a4ff875f77ad95daf6942c0d1

Merge commit 'd450cb07d91ef39ad1d39bd7ca0cfce4bd7b13e7'

* commit 'd450cb07d91ef39ad1d39bd7ca0cfce4bd7b13e7':
  avplay: Check memory allocation

Conflicts:
ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
---
 ijkmedia/ijkplayer/ff_ffplay.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ijkmedia/ijkplayer/ff_ffplay.c b/ijkmedia/ijkplayer/ff_ffplay.c
index 42e64f15..276f24b5 100644
--- a/ijkmedia/ijkplayer/ff_ffplay.c
+++ b/ijkmedia/ijkplayer/ff_ffplay.c
@@ -1522,6 +1522,9 @@ static int ffplay_video_thread(void *arg)
     enum AVPixelFormat last_format = -2;
     int last_serial = -1;
     int last_vfilter_idx = 0;
+    if (!graph)
+        return AVERROR(ENOMEM);
+
 #endif
 
     if (!frame)
-- 
GitLab