ff_ffplay: merge: a821617b5a09321a4ff875f77ad95daf6942c0d1

Merge commit 'd450cb07d91ef39ad1d39bd7ca0cfce4bd7b13e7'

* commit 'd450cb07d91ef39ad1d39bd7ca0cfce4bd7b13e7':
  avplay: Check memory allocation

Conflicts:
ffplay.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

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)