Merge remote-tracking branch 'newdev/master'

[ffmpeg] / ffplay.c

diff --git a/ffplay.c b/ffplay.c
index d45cce3ed1a148ca7bc9ad84863cf1587dfa1b05..c44264ed4a7db73420492d19cca0c0a41ef74fa1 100644 (file)
--- a/ffplay.c
+++ b/ffplay.c
@@ -2575,7 +2575,7 @@ static int decode_thread(void *arg)
         if (ret < 0) {
             if (ret == AVERROR_EOF || url_feof(ic->pb))
                 eof=1;
-            if (ic->pb->error)
+            if (ic->pb && ic->pb->error)
                 break;
             SDL_Delay(100); /* wait for user event */
             continue;
@@ -3024,7 +3024,7 @@ static const OptionDef options[] = {
 #endif
     { "rdftspeed", OPT_INT | HAS_ARG| OPT_AUDIO | OPT_EXPERT, {(void*)&rdftspeed}, "rdft speed", "msecs" },
     { "default", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" },
-    { "i", OPT_DUMMY, NULL, "ffmpeg compatibility dummy option", ""},
+    { "i", OPT_DUMMY, {NULL}, "ffmpeg compatibility dummy option", ""},
     { NULL, },
 };