summaryrefslogtreecommitdiff
path: root/sdk-android-tutorial-video.md
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.com>2016-06-17 18:21:42 -0400
committerOlivier CrĂȘte <olivier.crete@collabora.com>2016-06-17 18:21:42 -0400
commit208c456f816bb2782cc5c47c5024e88479287c0c (patch)
treeb7eddd7f7bdb71304c4df632b81293624c2ef9c8 /sdk-android-tutorial-video.md
parentf131594d7dfa77ea6b32796fba5871b28ed76e43 (diff)
Remove most mentions of the SDK
Diffstat (limited to 'sdk-android-tutorial-video.md')
-rw-r--r--sdk-android-tutorial-video.md12
1 files changed, 6 insertions, 6 deletions
diff --git a/sdk-android-tutorial-video.md b/sdk-android-tutorial-video.md
index a9876a2..a43af3e 100644
--- a/sdk-android-tutorial-video.md
+++ b/sdk-android-tutorial-video.md
@@ -703,7 +703,7 @@ changed, and simply instruct the video sink to redraw itself, via the
size from the surface itself, so we do not need to bother about it
here. We need to call `gst_video_overlay_expose()` twice because of the way
the surface changes propagate down the OpenGL ES / EGL pipeline (The
-only video sink available for Android in the GStreamer SDK uses OpenGL
+only video sink available for Android in GStreamer uses OpenGL
ES). By the time we call the first expose, the surface that the sink
will pick up still contains the old size.
@@ -872,13 +872,13 @@ LOCAL_SHARED_LIBRARIES := gstreamer_android
LOCAL_LDLIBS := -llog -landroid
include $(BUILD_SHARED_LIBRARY)
-ifndef GSTREAMER_SDK_ROOT
-ifndef GSTREAMER_SDK_ROOT_ANDROID
-$(error GSTREAMER_SDK_ROOT_ANDROID is not defined!)
+ifndef GSTREAMER_ROOT
+ifndef GSTREAMER_ROOT_ANDROID
+$(error GSTREAMER_ROOT_ANDROID is not defined!)
endif
-GSTREAMER_SDK_ROOT := $(GSTREAMER_SDK_ROOT_ANDROID)
+GSTREAMER_ROOT := $(GSTREAMER_ROOT_ANDROID)
endif
-GSTREAMER_NDK_BUILD_PATH := $(GSTREAMER_SDK_ROOT)/share/gst-android/ndk-build/
+GSTREAMER_NDK_BUILD_PATH := $(GSTREAMER_ROOT)/share/gst-android/ndk-build/
include $(GSTREAMER_NDK_BUILD_PATH)/plugins.mk
GSTREAMER_PLUGINS := $(GSTREAMER_PLUGINS_CORE) $(GSTREAMER_PLUGINS_SYS) $(GSTREAMER_PLUGINS_EFFECTS)
GSTREAMER_EXTRA_DEPS := gstreamer-video-1.0