diff options
Diffstat (limited to 'www/seamonkey/files/patch-bug760899')
-rw-r--r-- | www/seamonkey/files/patch-bug760899 | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/www/seamonkey/files/patch-bug760899 b/www/seamonkey/files/patch-bug760899 new file mode 100644 index 000000000000..c81b855e7fc2 --- /dev/null +++ b/www/seamonkey/files/patch-bug760899 @@ -0,0 +1,54 @@ +commit 667daed +Author: Stephen Moehle <stephen.moehle@gmail.com> +Date: Tue Jun 5 11:32:36 2012 +1200 + + Bug 760899 - Fix debug builds with gstreamer enabled - r=kinetik + + --HG-- + extra : rebase_source : 22598bc470d35d94991ea9f1b14df11ba19a461a +--- + content/media/gstreamer/nsGStreamerReader.cpp | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp +index 6a50e09..164fb2e 100644 +--- mozilla/content/media/gstreamer/nsGStreamerReader.cpp ++++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp +@@ -278,7 +278,7 @@ nsresult nsGStreamerReader::ReadMetadata(nsVideoInfo* aInfo) + if (gst_element_query_duration(GST_ELEMENT(mPlayBin), + &format, &duration) && format == GST_FORMAT_TIME) { + ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor()); +- LOG(PR_LOG_DEBUG, ("returning duration %"GST_TIME_FORMAT, ++ LOG(PR_LOG_DEBUG, ("returning duration %" GST_TIME_FORMAT, + GST_TIME_ARGS (duration))); + duration = GST_TIME_AS_USECONDS (duration); + mDecoder->GetStateMachine()->SetDuration(duration); +@@ -422,8 +422,8 @@ bool nsGStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip, + nextTimestamp += gst_util_uint64_scale(GST_USECOND, fpsNum, fpsDen); + + if (timestamp < aTimeThreshold) { +- LOG(PR_LOG_DEBUG, ("skipping frame %"GST_TIME_FORMAT +- " threshold %"GST_TIME_FORMAT, ++ LOG(PR_LOG_DEBUG, ("skipping frame %" GST_TIME_FORMAT ++ " threshold %" GST_TIME_FORMAT, + GST_TIME_ARGS(timestamp), GST_TIME_ARGS(aTimeThreshold))); + gst_buffer_unref(buffer); + buffer = NULL; +@@ -489,7 +489,7 @@ nsresult nsGStreamerReader::Seek(PRInt64 aTarget, + NS_ASSERTION(mDecoder->OnDecodeThread(), "Should be on decode thread."); + + gint64 seekPos = aTarget * GST_USECOND; +- LOG(PR_LOG_DEBUG, ("%p About to seek to %"GST_TIME_FORMAT, ++ LOG(PR_LOG_DEBUG, ("%p About to seek to %" GST_TIME_FORMAT, + mDecoder, GST_TIME_ARGS(seekPos))); + + if (!gst_element_seek_simple(mPlayBin, GST_FORMAT_TIME, +@@ -592,7 +592,7 @@ PRInt64 nsGStreamerReader::QueryDuration() + if (gst_element_query_duration(GST_ELEMENT(mPlayBin), + &format, &duration)) { + if (format == GST_FORMAT_TIME) { +- LOG(PR_LOG_DEBUG, ("pipeline duration %"GST_TIME_FORMAT, ++ LOG(PR_LOG_DEBUG, ("pipeline duration %" GST_TIME_FORMAT, + GST_TIME_ARGS (duration))); + duration = GST_TIME_AS_USECONDS (duration); + } |