mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 01:00:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

launch: Fix memory management issue with the rendering format

Browse source
This commit is contained in:
Thibault Saunier 2020-02-28 11:52:38 -03:00
parent f7bd6d63c4
commit f0677291d1
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tools/ges-launcher.c
View file

@ -477,8 +477,6 @@ _set_rendering_details (GESLauncher * self)
/* Setup profile/encoding if needed */ /* Setup profile/encoding if needed */
if (opts->outputuri) { if (opts->outputuri) {
GstEncodingProfile *prof = NULL; GstEncodingProfile *prof = NULL;
gchar *format = NULL;
if (!opts->format) { if (!opts->format) {
GESProject *proj = GESProject *proj =
GES_PROJECT (ges_extractable_get_asset (GES_EXTRACTABLE (self-> GES_PROJECT (ges_extractable_get_asset (GES_EXTRACTABLE (self->
@ -496,18 +494,25 @@ _set_rendering_details (GESLauncher * self)
} }
if (!prof) { if (!prof) {
if (opts->format == NULL) if (opts->format == NULL) {
opts->format = get_file_extension (opts->outputuri); opts->format = get_file_extension (opts->outputuri);
prof = parse_encoding_profile (opts->format); prof = parse_encoding_profile (opts->format);
} else {
prof = parse_encoding_profile (opts->format);
if (!prof)
g_error ("Invalid format specified: %s", opts->format);
}
if (!prof) { if (!prof) {
warn ("No format specified and couldn't find one from output file extension, " "falling back to theora+vorbis in ogg."); warn ("No format specified and couldn't find one from output file extension, " "falling back to theora+vorbis in ogg.");
format = opts->format = g_free (opts->format);
opts->format =
g_strdup ("application/ogg:video/x-theora:audio/x-vorbis"); g_strdup ("application/ogg:video/x-theora:audio/x-vorbis");
prof = parse_encoding_profile (opts->format); prof = parse_encoding_profile (opts->format);
} }
g_free (format);
if (!prof) { if (!prof) {
printerr ("Could not find any encoding format for %s\n", opts->format); printerr ("Could not find any encoding format for %s\n", opts->format);
return FALSE; return FALSE;

2
tools/utils.c
View file

@ -232,7 +232,7 @@ get_file_extension (gchar * uri)
if (find <= 0) if (find <= 0)
return NULL; return NULL;
return &uri[find + 1]; return g_strdup (&uri[find + 1]);
} }
static const gchar * static const gchar *