mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-23 16:50:47 +00:00
launch: Fix memory management issue with the rendering format
This commit is contained in:
parent
f7bd6d63c4
commit
f0677291d1
2 changed files with 12 additions and 7 deletions
|
@ -477,8 +477,6 @@ _set_rendering_details (GESLauncher * self)
|
|||
/* Setup profile/encoding if needed */
|
||||
if (opts->outputuri) {
|
||||
GstEncodingProfile *prof = NULL;
|
||||
gchar *format = NULL;
|
||||
|
||||
if (!opts->format) {
|
||||
GESProject *proj =
|
||||
GES_PROJECT (ges_extractable_get_asset (GES_EXTRACTABLE (self->
|
||||
|
@ -496,18 +494,25 @@ _set_rendering_details (GESLauncher * self)
|
|||
}
|
||||
|
||||
if (!prof) {
|
||||
if (opts->format == NULL)
|
||||
if (opts->format == NULL) {
|
||||
opts->format = get_file_extension (opts->outputuri);
|
||||
|
||||
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) {
|
||||
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");
|
||||
prof = parse_encoding_profile (opts->format);
|
||||
}
|
||||
|
||||
g_free (format);
|
||||
if (!prof) {
|
||||
printerr ("Could not find any encoding format for %s\n", opts->format);
|
||||
return FALSE;
|
||||
|
|
|
@ -232,7 +232,7 @@ get_file_extension (gchar * uri)
|
|||
if (find <= 0)
|
||||
return NULL;
|
||||
|
||||
return &uri[find + 1];
|
||||
return g_strdup (&uri[find + 1]);
|
||||
}
|
||||
|
||||
static const gchar *
|
||||
|
|
Loading…
Reference in a new issue