[FFmpeg-cvslog] dshow:protect access to curbufsize to promote consistency

rogerdpack git at videolan.org
Mon Aug 20 21:02:17 CEST 2012


ffmpeg | branch: master | rogerdpack <rogerpack2005 at gmail.com> | Sun Aug 19 08:10:07 2012 -0600| [415f4cca1dfd581acd78d246d765b6e466a6e4ed] | committer: Michael Niedermayer

dshow:protect access to curbufsize to promote consistency

Signed-off-by: rogerdpack <rogerpack2005 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavdevice/dshow.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c
index 0d1987b..ea6c21c 100644
--- a/libavdevice/dshow.c
+++ b/libavdevice/dshow.c
@@ -207,11 +207,11 @@ callback(void *priv_data, int index, uint8_t *buf, int buf_size, int64_t time)
 
 //    dump_videohdr(s, vdhdr);
 
-    if(shall_we_drop(s))
-        return;
-
     WaitForSingleObject(ctx->mutex, INFINITE);
 
+    if(shall_we_drop(s))
+        goto fail;
+
     pktl_next = av_mallocz(sizeof(AVPacketList));
     if(!pktl_next)
         goto fail;



More information about the ffmpeg-cvslog mailing list