summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrtogni <rtogni@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-29 14:26:23 +0000
committerrtogni <rtogni@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-29 14:26:23 +0000
commit54abc1a05e8a022d4738f5a1e8f68f574be49ced (patch)
tree4fc7d5f40cf311d04441a7e262fd90b79f922902
parentfbe914dc00bbd63ac239b9cf2637a3efda227e56 (diff)
downloadmpv-54abc1a05e8a022d4738f5a1e8f68f574be49ced.tar.bz2
mpv-54abc1a05e8a022d4738f5a1e8f68f574be49ced.tar.xz
Prevent segfault if video codec init fails
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20515 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libmpdemux/demux_real.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c
index e97eae4d67..60a2c585fd 100644
--- a/libmpdemux/demux_real.c
+++ b/libmpdemux/demux_real.c
@@ -571,6 +571,10 @@ static int demux_real_fill_buffer(demuxer_t *demuxer, demux_stream_t *dsds)
int x, sps, cfs, sph, spc, w;
int audioreorder_getnextpk = 0;
+ // Don't demux video if video codec init failed
+ if (demuxer->video->id >= 0 && !demuxer->video->sh)
+ demuxer->video->id = -2;
+
while(!stream_eof(demuxer->stream)){
/* Handle audio/video demxing switch for multirate files (non-interleaved) */