]> git.sesse.net Git - mlt/commitdiff
Change previous mods to use mlt_multitrack_count()
authorDan Dennedy <dan@dennedy.org>
Mon, 5 Sep 2011 06:17:44 +0000 (23:17 -0700)
committerDan Dennedy <dan@dennedy.org>
Mon, 5 Sep 2011 06:17:44 +0000 (23:17 -0700)
src/modules/melt/producer_melt.c
src/modules/xml/producer_xml.c

index 8192f2c88f030b3f36fa7d44e09be43eebfe5e93..310bc14c0b1031f6e6d1f6654f6df767d23a59b9 100644 (file)
@@ -450,8 +450,8 @@ mlt_producer producer_melt_init( mlt_profile profile, mlt_service_type type, con
        }
 
        // Set the size of the producer_avformat cache to the number of tracks.
-       if ( track > mlt_service_cache_get_size( MLT_PLAYLIST_SERVICE( playlist ), "producer_avformat" ) )
-               mlt_service_cache_set_size( MLT_PLAYLIST_SERVICE( playlist ), "producer_avformat", track + 2 );
+       if ( mlt_multitrack_count( multitrack ) > mlt_service_cache_get_size( MLT_PLAYLIST_SERVICE( playlist ), "producer_avformat" ) )
+               mlt_service_cache_set_size( MLT_PLAYLIST_SERVICE( playlist ), "producer_avformat", mlt_multitrack_count( multitrack ) + 2 );
 
        // Connect last producer to playlist
        if ( producer != NULL && !mlt_producer_is_cut( producer ) )
index bc73f49c561092a3f2a151d414d9f95c10755ab8..08003c9ecf207210d4e131999c531a7282ab1eb3 100644 (file)
@@ -881,8 +881,8 @@ static void on_end_track( deserialise_context context, const xmlChar *name )
                        }
 
                        // Set the size of the producer_avformat cache to the number of tracks.
-                       if ( multitrack->count > mlt_service_cache_get_size( MLT_MULTITRACK_SERVICE(multitrack), "producer_avformat" ) )
-                               mlt_service_cache_set_size( MLT_MULTITRACK_SERVICE(multitrack), "producer_avformat", multitrack->count + 2 );
+                       if ( mlt_multitrack_count( multitrack ) > mlt_service_cache_get_size( MLT_MULTITRACK_SERVICE(multitrack), "producer_avformat" ) )
+                               mlt_service_cache_set_size( MLT_MULTITRACK_SERVICE(multitrack), "producer_avformat", mlt_multitrack_count( multitrack ) + 2 );
                }
 
                if ( parent != NULL )