From 96f69fa99882dbef37662fba3ff6fc97a5ff3d93 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Wed, 28 Oct 2015 15:47:00 +0100 Subject: [PATCH] encoding-target: Allow having encoding target without a category set There was already some code to handle that, but the support was not complete in those code paths. --- gst-libs/gst/pbutils/encoding-target.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gst-libs/gst/pbutils/encoding-target.c b/gst-libs/gst/pbutils/encoding-target.c index 8d5965d..d418a69 100644 --- a/gst-libs/gst/pbutils/encoding-target.c +++ b/gst-libs/gst/pbutils/encoding-target.c @@ -268,7 +268,7 @@ gst_encoding_target_new (const gchar * name, const gchar * category, /* Validate name */ if (!validate_name (name)) goto invalid_name; - if (!validate_name (category)) + if (category && !validate_name (category)) goto invalid_category; res = (GstEncodingTarget *) g_object_new (GST_TYPE_ENCODING_TARGET, NULL); @@ -789,11 +789,16 @@ get_matching_filenames (gchar * path, gchar * filename) GList *res = NULL; GDir *topdir; const gchar *subdirname; + gchar *tmp; topdir = g_dir_open (path, 0, NULL); if (G_UNLIKELY (topdir == NULL)) return NULL; + tmp = g_build_filename (path, filename, NULL); + if (g_file_test (tmp, G_FILE_TEST_EXISTS)) + res = g_list_append (res, tmp); + while ((subdirname = g_dir_read_name (topdir))) { gchar *ltmp = g_build_filename (path, subdirname, NULL); -- 2.7.4