[FFmpeg-cvslog] vf_mp: fix null ptr deref in case of ENOMEM

Michael Niedermayer git at videolan.org
Fri Oct 19 20:00:23 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 19 19:55:01 2012 +0200| [aaf78e4d14b4875e4cff30e979421a1087337b9f] | committer: Michael Niedermayer

vf_mp: fix null ptr deref in case of ENOMEM

Fixes CID703675
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavfilter/vf_mp.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavfilter/vf_mp.c b/libavfilter/vf_mp.c
index e31fccd..9e3270e 100644
--- a/libavfilter/vf_mp.c
+++ b/libavfilter/vf_mp.c
@@ -575,8 +575,8 @@ mp_image_t* vf_get_image(vf_instance_t* vf, unsigned int outfmt, int mp_imgtype,
     }
 
   mpi->qscale = NULL;
-  }
   mpi->usage_count++;
+  }
 //    printf("\rVF_MPI: %p %p %p %d %d %d    \n",
 //      mpi->planes[0],mpi->planes[1],mpi->planes[2],
 //      mpi->stride[0],mpi->stride[1],mpi->stride[2]);



More information about the ffmpeg-cvslog mailing list