summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authorattila <attila@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-11-03 10:42:28 +0000
committerattila <attila@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-11-03 10:42:28 +0000
commitf10ca60dbd0f6b368ad2fb4e1278de0c324b742e (patch)
tree82ada001cb10ae7cc16736a0c5c63770c626fae7 /libmpcodecs
parent33abd0ca160d8f23c2154f7b5b6dfaabffeb02de (diff)
downloadmpv-f10ca60dbd0f6b368ad2fb4e1278de0c324b742e.tar.bz2
mpv-f10ca60dbd0f6b368ad2fb4e1278de0c324b742e.tar.xz
If alex is too lazy to apply a patch, then i'll do it :)
This one fixes a sig11 when the -vo can't be initialized and get_buffer fails for libavcodec git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11373 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/vd_ffmpeg.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c
index 6f97991d28..fe21232947 100644
--- a/libmpcodecs/vd_ffmpeg.c
+++ b/libmpcodecs/vd_ffmpeg.c
@@ -727,6 +727,9 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
mpi->stride[1]=pic->linesize[1];
mpi->stride[2]=pic->linesize[2];
}
+
+ if (!mpi->planes[0])
+ return NULL;
if(avctx->pix_fmt==PIX_FMT_YUV422P && mpi->chroma_y_shift==1){
// we have 422p but user wants 420p