Merge remote-tracking branch 'origin/master' into 0.11

[platform/upstream/gstreamer.git] / tests / examples / encoding / encoding.c

diff --git a/tests/examples/encoding/encoding.c b/tests/examples/encoding/encoding.c
index 497aa63..bb0072a 100644 (file)
--- a/tests/examples/encoding/encoding.c
+++ b/tests/examples/encoding/encoding.c
@@ -225,7 +225,7 @@ pad_added_cb (GstElement * uridecodebin, GstPad * pad, GstElement * encodebin)
     GstCaps *caps;
 
     /* Ask encodebin for a compatible pad */
-    caps = gst_pad_get_caps (pad, NULL);
+    caps = gst_pad_query_caps (pad, NULL);
     g_signal_emit_by_name (encodebin, "request-pad", caps, &sinkpad);
     if (caps)
       gst_caps_unref (caps);
@@ -395,8 +395,10 @@ main (int argc, char **argv)
   GstEncodingProfile *prof;
   gchar *inputuri;
 
+#if !GLIB_CHECK_VERSION (2, 31, 0)
   if (!g_thread_supported ())
     g_thread_init (NULL);
+#endif
 
   ctx = g_option_context_new ("- encode URIs with GstProfile and encodebin");
   g_option_context_add_main_entries (ctx, options, NULL);
@@ -501,7 +503,7 @@ main (int argc, char **argv)
       return 1;
     }
 
-    /* Trancode file */
+    /* Transcode file */
     transcode_file (inputuri, outputuri, prof);
 
     /* cleanup */