Skip to content

Commit

Permalink
Merge r176541 - [GStreamer] gstmpegts is not initialized
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=139039

Reviewed by Carlos Garcia Campos.

* platform/graphics/gstreamer/GStreamerUtilities.cpp:
(WebCore::initializeGStreamer): Initialize the gstmpegts library.

Canonical link: https://commits.webkit.org/154760.239@webkitgtk/2.6
git-svn-id: https://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-2.6@178274 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
philn authored and carlosgcampos committed Jan 12, 2015
1 parent f8f31da commit 1a84900
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 0 deletions.
10 changes: 10 additions & 0 deletions Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
2014-11-25 Philippe Normand <pnormand@igalia.com>

[GStreamer] gstmpegts is not initialized
https://bugs.webkit.org/show_bug.cgi?id=139039

Reviewed by Carlos Garcia Campos.

* platform/graphics/gstreamer/GStreamerUtilities.cpp:
(WebCore::initializeGStreamer): Initialize the gstmpegts library.

2014-11-21 Chris Dumez <cdumez@apple.com>

Crash when setting 'transition-delay' CSS property to a calculated value
Expand Down
12 changes: 12 additions & 0 deletions Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp
Expand Up @@ -29,6 +29,12 @@
#include <wtf/MathExtras.h>
#include <wtf/gobject/GUniquePtr.h>

#if ENABLE(VIDEO_TRACK) && USE(GSTREAMER_MPEGTS)
#define GST_USE_UNSTABLE_API
#include <gst/mpegts/mpegts.h>
#undef GST_USE_UNSTABLE_API
#endif

namespace WebCore {

const char* webkitGstMapInfoQuarkString = "webkit-gst-map-info";
Expand Down Expand Up @@ -132,6 +138,12 @@ bool initializeGStreamer()
// FIXME: We should probably pass the arguments from the command line.
bool gstInitialized = gst_init_check(0, 0, &error.outPtr());
ASSERT_WITH_MESSAGE(gstInitialized, "GStreamer initialization failed: %s", error ? error->message : "unknown error occurred");

#if ENABLE(VIDEO_TRACK) && USE(GSTREAMER_MPEGTS)
if (gstInitialized)
gst_mpegts_initialize();
#endif

return gstInitialized;
}

Expand Down

0 comments on commit 1a84900

Please sign in to comment.