[SCM] libav/experimental: Fix segfault Patch by R. Brian Anderson (andersrb AT cliftonlabs DOT com)

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:48:06 UTC 2013


The following commit has been merged in the experimental branch:
commit eaddc4717bd6e295e9d8c140fb9fb8a4c6b60fb8
Author: R. Brian Anderson <andersrb at cliftonlabs.com>
Date:   Thu Jun 15 15:15:20 2006 +0000

    Fix segfault
    Patch by R. Brian Anderson (andersrb AT cliftonlabs DOT com)
    
    Originally committed as revision 5480 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/v4l2.c b/libavformat/v4l2.c
index 7404ef5..3a2ad1f 100644
--- a/libavformat/v4l2.c
+++ b/libavformat/v4l2.c
@@ -457,7 +457,9 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap)
     if (capabilities & V4L2_CAP_STREAMING) {
         s->io_method = io_mmap;
         res = mmap_init(s);
-        res = mmap_start(s);
+        if (res == 0) {
+            res = mmap_start(s);
+        }
     } else {
         s->io_method = io_read;
         res = read_init(s);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list