[FFmpeg-cvslog] ffplay: Don't assume ic->pb is non-null

Martin Storsjö git at videolan.org
Wed Mar 23 03:03:41 CET 2011


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Mon Mar 21 15:52:54 2011 +0200| [648c79624fa70414dfb644fcb84b9de15e6568b0] | committer: Ronald S. Bultje

ffplay: Don't assume ic->pb is non-null

This fixes crashes on exit when plaing some RealRTSP streams
(among other), e.g.
rtsp://dl.lib.brown.edu:554/areserves/1093545294660883.mp3.
These crashes have been present since 3e68b3ba7b015cf21.

Signed-off-by: Ronald S. Bultje <rsbultje at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=648c79624fa70414dfb644fcb84b9de15e6568b0
---

 ffplay.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ffplay.c b/ffplay.c
index 1e5244c..ddd2c4d 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -2568,9 +2568,9 @@ static int decode_thread(void *arg)
         }
         ret = av_read_frame(ic, pkt);
         if (ret < 0) {
-            if (ret == AVERROR_EOF || ic->pb->eof_reached)
+            if (ret == AVERROR_EOF || (ic->pb && ic->pb->eof_reached))
                 eof=1;
-            if (ic->pb->error)
+            if (ic->pb && ic->pb->error)
                 break;
             SDL_Delay(100); /* wait for user event */
             continue;




More information about the ffmpeg-cvslog mailing list