firefox/iceape-2.12-b8c6c7c773c3-gstreamer-video-segfault.patch

32 lines
1.2 KiB
Diff
Raw Normal View History

# HG changeset patch
# User Stephen Moehle <stephen.moehle@gmail.com>
# Date 1338852673 -43200
# Node ID b8c6c7c773c3b58355c0c47873810feff21601d3
# Parent 22a1bfac13d6d1a7fb9dfd0733494daa43b1623e
Bug 761030 - Fix crash with HTML 5 video with GStreamer enabled - r=kinetik
diff --git a/content/media/gstreamer/nsGStreamerReader.cpp b/content/media/gstreamer/nsGStreamerReader.cpp
--- a/content/media/gstreamer/nsGStreamerReader.cpp
+++ b/content/media/gstreamer/nsGStreamerReader.cpp
@@ -447,16 +447,18 @@ bool nsGStreamerReader::DecodeVideoFrame
for(int i = 0; i < 3; i++) {
b.mPlanes[i].mData = data + gst_video_format_get_component_offset(format, i,
width, height);
b.mPlanes[i].mStride = gst_video_format_get_row_stride(format, i, width);
b.mPlanes[i].mHeight = gst_video_format_get_component_height(format,
i, height);
b.mPlanes[i].mWidth = gst_video_format_get_component_width(format,
i, width);
+ b.mPlanes[i].mOffset = 0;
+ b.mPlanes[i].mSkip = 0;
}
bool isKeyframe = !GST_BUFFER_FLAG_IS_SET(buffer,
GST_BUFFER_FLAG_DELTA_UNIT);
/* XXX ? */
PRInt64 offset = 0;
VideoData *video = VideoData::Create(mInfo,
mDecoder->GetImageContainer(),