mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-26 09:08:14 +00:00
Code Issues 1 Projects Releases Wiki Activity

qtmux: fix GST_ELEMENT_ERROR usage

Browse source 
We need to pass (NULL) rather than NULL for empty arguments.
This commit is contained in:
Tim-Philipp Müller 2010-03-11 17:17:15 +00:00
parent ae0d32843e
commit f9bba010fa
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gst/quicktime/gstqtmoovrecover.c
View file

@ -188,19 +188,19 @@ gst_qt_moov_recover_run (void *data)
if (qtmr->broken_input == NULL) { if (qtmr->broken_input == NULL) {
GST_OBJECT_UNLOCK (qtmr); GST_OBJECT_UNLOCK (qtmr);
GST_ELEMENT_ERROR (qtmr, RESOURCE, SETTINGS, GST_ELEMENT_ERROR (qtmr, RESOURCE, SETTINGS,
("Please set broken-input property"), NULL); ("Please set broken-input property"), (NULL));
goto end; goto end;
} }
if (qtmr->recovery_input == NULL) { if (qtmr->recovery_input == NULL) {
GST_OBJECT_UNLOCK (qtmr); GST_OBJECT_UNLOCK (qtmr);
GST_ELEMENT_ERROR (qtmr, RESOURCE, SETTINGS, GST_ELEMENT_ERROR (qtmr, RESOURCE, SETTINGS,
("Please set recovery-input property"), NULL); ("Please set recovery-input property"), (NULL));
goto end; goto end;
} }
if (qtmr->fixed_output == NULL) { if (qtmr->fixed_output == NULL) {
GST_OBJECT_UNLOCK (qtmr); GST_OBJECT_UNLOCK (qtmr);
GST_ELEMENT_ERROR (qtmr, RESOURCE, SETTINGS, GST_ELEMENT_ERROR (qtmr, RESOURCE, SETTINGS,
("Please set fixed-output property"), NULL); ("Please set fixed-output property"), (NULL));
goto end; goto end;
} }
@ -210,7 +210,7 @@ gst_qt_moov_recover_run (void *data)
if (moovrec == NULL) { if (moovrec == NULL) {
GST_OBJECT_UNLOCK (qtmr); GST_OBJECT_UNLOCK (qtmr);
GST_ELEMENT_ERROR (qtmr, RESOURCE, OPEN_READ, GST_ELEMENT_ERROR (qtmr, RESOURCE, OPEN_READ,
("Failed to open recovery-input file"), NULL); ("Failed to open recovery-input file"), (NULL));
goto end; goto end;
} }
@ -218,14 +218,14 @@ gst_qt_moov_recover_run (void *data)
if (mdatinput == NULL) { if (mdatinput == NULL) {
GST_OBJECT_UNLOCK (qtmr); GST_OBJECT_UNLOCK (qtmr);
GST_ELEMENT_ERROR (qtmr, RESOURCE, OPEN_READ, GST_ELEMENT_ERROR (qtmr, RESOURCE, OPEN_READ,
("Failed to open broken-input file"), NULL); ("Failed to open broken-input file"), (NULL));
goto end; goto end;
} }
output = g_fopen (qtmr->fixed_output, "wb+"); output = g_fopen (qtmr->fixed_output, "wb+");
if (output == NULL) { if (output == NULL) {
GST_OBJECT_UNLOCK (qtmr); GST_OBJECT_UNLOCK (qtmr);
GST_ELEMENT_ERROR (qtmr, RESOURCE, OPEN_READ_WRITE, GST_ELEMENT_ERROR (qtmr, RESOURCE, OPEN_READ_WRITE,
("Failed to open fixed-output file"), NULL); ("Failed to open fixed-output file"), (NULL));
goto end; goto end;
} }
GST_OBJECT_UNLOCK (qtmr); GST_OBJECT_UNLOCK (qtmr);
@ -236,14 +236,14 @@ gst_qt_moov_recover_run (void *data)
mdatinput = NULL; mdatinput = NULL;
if (mdat_recov == NULL) { if (mdat_recov == NULL) {
GST_ELEMENT_ERROR (qtmr, RESOURCE, FAILED, GST_ELEMENT_ERROR (qtmr, RESOURCE, FAILED,
("Broken file could not be parsed correctly"), NULL); ("Broken file could not be parsed correctly"), (NULL));
goto end; goto end;
} }
moov_recov = moov_recov_file_create (moovrec, &err); moov_recov = moov_recov_file_create (moovrec, &err);
moovrec = NULL; moovrec = NULL;
if (moov_recov == NULL) { if (moov_recov == NULL) {
GST_ELEMENT_ERROR (qtmr, RESOURCE, FAILED, GST_ELEMENT_ERROR (qtmr, RESOURCE, FAILED,
("Recovery file could not be parsed correctly"), NULL); ("Recovery file could not be parsed correctly"), (NULL));
goto end; goto end;
} }
@ -265,7 +265,7 @@ gst_qt_moov_recover_run (void *data)
end: end:
GST_LOG_OBJECT (qtmr, "Finalizing task"); GST_LOG_OBJECT (qtmr, "Finalizing task");
if (err) { if (err) {
GST_ELEMENT_ERROR (qtmr, RESOURCE, FAILED, ("%s", err->message), NULL); GST_ELEMENT_ERROR (qtmr, RESOURCE, FAILED, ("%s", err->message), (NULL));
g_error_free (err); g_error_free (err);
} }