From 7d0a6efaff534fc8a371e58327db3d34f0c19e07 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Wed, 8 Jan 2014 09:44:02 +0100 Subject: [PATCH] validate: tools: media-info: Fixes in the media file descriptor parsing code We used to always fail when the user was passing something not NULL as err --- validate/gst/validate/gst-validate-media-info.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/validate/gst/validate/gst-validate-media-info.c b/validate/gst/validate/gst-validate-media-info.c index 0ac22db3c5..6e37795edc 100644 --- a/validate/gst/validate/gst-validate-media-info.c +++ b/validate/gst/validate/gst-validate-media-info.c @@ -177,13 +177,13 @@ gst_validate_media_info_load (const gchar * path, GError ** err) gst_validate_media_info_init (mi); mi->uri = g_key_file_get_string (kf, "file-info", "uri", err); - if (err) + if (err && *err) goto end; mi->file_size = g_key_file_get_uint64 (kf, "file-info", "file-size", err); - if (err) + if (err && *err) goto end; - mi->duration = g_key_file_get_uint64 (kf, "media-info", "duration", NULL); + mi->duration = g_key_file_get_uint64 (kf, "media-info", "file-duration", NULL); mi->seekable = g_key_file_get_boolean (kf, "media-info", "seekable", NULL); str = g_key_file_get_string (kf, "media-info", "caps", NULL);