diff options
author | voroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-11-18 05:07:51 +0000 |
---|---|---|
committer | voroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-11-18 05:07:51 +0000 |
commit | c8b82b4b804a4fe081574b04f3aca5d99da05969 (patch) | |
tree | 6681a03cdd633dc367690c1a2a9c108e78e2b148 /stream | |
parent | 5c684e7e4c2fda5137aa16a3e13e394ef45a8aa1 (diff) | |
download | mpv-c8b82b4b804a4fe081574b04f3aca5d99da05969.tar.bz2 mpv-c8b82b4b804a4fe081574b04f3aca5d99da05969.tar.xz |
Handle "out of memory" error.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25086 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream')
-rw-r--r-- | stream/tvi_dshow.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/stream/tvi_dshow.c b/stream/tvi_dshow.c index 3a8f77ed7d..4b82f8a2a6 100644 --- a/stream/tvi_dshow.c +++ b/stream/tvi_dshow.c @@ -2419,6 +2419,8 @@ static HRESULT build_video_chain(priv_t *priv) } priv->v_buf=calloc(1,sizeof(grabber_ringbuffer_t)); + if(!priv->v_buf) + return E_OUTOFMEMORY; if (priv->tv_param->buffer_size >= 0) { priv->v_buf->buffersize = priv->tv_param->buffer_size; @@ -2458,6 +2460,8 @@ static HRESULT build_audio_chain(priv_t *priv) if(priv->pmtAudio){ priv->a_buf=calloc(1,sizeof(grabber_ringbuffer_t)); + if(!priv->a_buf) + return E_OUTOFMEMORY; /* let the audio buffer be the same size (in seconds) than video one */ priv->a_buf->buffersize=audio_buf_size_from_video( @@ -2488,6 +2492,9 @@ static HRESULT build_vbi_chain(priv_t *priv) if(priv->tv_param->tdevice) { priv->vbi_buf=calloc(1,sizeof(grabber_ringbuffer_t)); + if(!priv->vbi_buf) + return E_OUTOFMEMORY; + init_ringbuffer(priv->vbi_buf,24,priv->tsp.bufsize); priv->pmtVBI=calloc(1,sizeof(AM_MEDIA_TYPE)); |