1 # HG changeset patch

     2 # Parent 305397d1d86aaf3d3da2e9357eea2fdd1888a325

     3 # User Wolfgang Rosenauer <wr@rosenauer.org>

     4 Bug 761030 - Crash with HTML 5 video with gstreamer enabled (TM: 16)

     5 

     6 diff --git a/content/media/gstreamer/nsGStreamerReader.cpp b/content/media/gstreamer/nsGStreamerReader.cpp

     7 --- a/content/media/gstreamer/nsGStreamerReader.cpp

     8 +++ b/content/media/gstreamer/nsGStreamerReader.cpp

     9 @@ -447,16 +447,18 @@ bool nsGStreamerReader::DecodeVideoFrame

    10    for(int i = 0; i < 3; i++) {

    11      b.mPlanes[i].mData = data + gst_video_format_get_component_offset(format, i,

    12          width, height);

    13      b.mPlanes[i].mStride = gst_video_format_get_row_stride(format, i, width);

    14      b.mPlanes[i].mHeight = gst_video_format_get_component_height(format,

    15          i, height);

    16      b.mPlanes[i].mWidth = gst_video_format_get_component_width(format,

    17          i, width);

    18 +    b.mPlanes[i].mOffset = 0;

    19 +    b.mPlanes[i].mSkip = 0;

    20    }

    21  

    22    bool isKeyframe = !GST_BUFFER_FLAG_IS_SET(buffer,

    23        GST_BUFFER_FLAG_DELTA_UNIT);

    24    /* XXX ? */

    25    PRInt64 offset = 0;

    26    VideoData *video = VideoData::Create(mInfo,

    27                                         mDecoder->GetImageContainer(),