fix westley for mixed element text and entity references

[melted] / src / modules / fezzik / producer_fezzik.c

diff --git a/src/modules/fezzik/producer_fezzik.c b/src/modules/fezzik/producer_fezzik.c
index ea63282..b06e420 100644 (file)
--- a/src/modules/fezzik/producer_fezzik.c
+++ b/src/modules/fezzik/producer_fezzik.c
@@ -88,6 +88,7 @@ static mlt_producer create_producer( char *file )
                        char temp[ 1024 ];
                        sprintf( temp, "%s/fezzik.dict", mlt_factory_prefix( ) );
                        dictionary = mlt_properties_load( temp );
+                       mlt_factory_register_for_clean_up( dictionary, ( mlt_destructor )mlt_properties_close );
                }
 
                // Convert the lookup string to lower case
@@ -108,6 +109,10 @@ static mlt_producer create_producer( char *file )
                free( lookup );
        }
 
+       // Finally, try just loading as service
+       if ( result == NULL )
+               result = mlt_factory_producer( file, NULL );
+
        return result;
 }
 
@@ -179,6 +184,9 @@ mlt_producer producer_fezzik_init( char *arg )
                        // We need to ensure that all further properties are mirrored in the producer
                        mlt_properties_mirror( properties, mlt_producer_properties( producer ) );
 
+                       // Ensure that the inner producer ignores the in point
+                       mlt_properties_set_int( mlt_producer_properties( producer ), "ignore_points", 1 );
+
                        // Now, we return the producer of the tractor
                        producer = mlt_tractor_producer( tractor );
                }