Merge commit 'd450cb07'

* commit 'd450cb07':
  avplay: Check memory allocation

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

ffplay.c

@@ -2231,6 +2231,9 @@ static int 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)