Add support for frei0r string parameter.

diff --git a/src/framework/mlt_tokeniser.c b/src/framework/mlt_tokeniser.c
index 1fa28b03fcc21756fbf97ed0a30dbc052593d395..3db3e2b7ac44f945fe460eeb99b369f61368b5a1 100644 (file)
--- a/src/framework/mlt_tokeniser.c
+++ b/src/framework/mlt_tokeniser.c
@@ -119,7 +119,7 @@ int mlt_tokeniser_parse_new( mlt_tokeniser tokeniser, char *string, const char *
                }
                else
                {
-                       index += strlen( delimiter );
+                       index += delimiter_size;
                }
        }
 

diff --git a/src/modules/frei0r/frei0r_helper.c b/src/modules/frei0r/frei0r_helper.c
index 39040d9356a3610544e1f3eac5e0cf6dcf359fcf..83ed8fcd0f6f2b12d6e2bafad3577176ca73aecc 100644 (file)
--- a/src/modules/frei0r/frei0r_helper.c
+++ b/src/modules/frei0r/frei0r_helper.c
@@ -90,6 +90,12 @@ int process_frei0r_item( mlt_service_type type, double position, mlt_properties
                                                f0r_set_param_value(inst, &color, i);
                                                break;
                                        }
+                                       case F0R_PARAM_STRING:
+                                       {
+                                               f0r_param_string val = mlt_properties_get(prop, pinfo.name);
+                                               if (val) f0r_set_param_value(inst, &val, i);
+                                               break;
+                                       }
                                }
                        }
                }