From a2bc2ae20b0d939f3f6e18a373636c1038c735c6 Mon Sep 17 00:00:00 2001 From: Dan Dennedy Date: Sun, 27 Mar 2011 09:50:29 -0700 Subject: [PATCH] Use mlt_properties_get_value where possible. --- src/modules/avformat/consumer_avformat.c | 6 +++--- src/modules/sox/filter_sox.c | 2 +- src/modules/xml/producer_xml.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c index e1f5c6f2..d42fa893 100644 --- a/src/modules/avformat/consumer_avformat.c +++ b/src/modules/avformat/consumer_avformat.c @@ -399,11 +399,11 @@ static void apply_properties( void *obj, mlt_properties properties, int flags, i const AVOption *opt = av_find_opt( obj, opt_name, NULL, flags, flags ); if ( opt != NULL ) #if LIBAVCODEC_VERSION_INT >= ((52<<16)+(7<<8)+0) - av_set_string3( obj, opt_name, mlt_properties_get( properties, opt_name), alloc, NULL ); + av_set_string3( obj, opt_name, mlt_properties_get_value( properties, i), alloc, NULL ); #elif LIBAVCODEC_VERSION_INT >= ((51<<16)+(59<<8)+0) - av_set_string2( obj, opt_name, mlt_properties_get( properties, opt_name), alloc ); + av_set_string2( obj, opt_name, mlt_properties_get_value( properties, i), alloc ); #else - av_set_string( obj, opt_name, mlt_properties_get( properties, opt_name) ); + av_set_string( obj, opt_name, mlt_properties_get_value( properties, i) ); #endif } } diff --git a/src/modules/sox/filter_sox.c b/src/modules/sox/filter_sox.c index 34504bf9..483e0f58 100644 --- a/src/modules/sox/filter_sox.c +++ b/src/modules/sox/filter_sox.c @@ -245,7 +245,7 @@ static int filter_get_audio( mlt_frame frame, void **buffer, mlt_audio_format *f if ( !strncmp( name, "effect", 6 ) ) { // Get the effect specification - char *value = mlt_properties_get( filter_properties, name ); + char *value = mlt_properties_get_value( filter_properties, j ); // Create an instance if ( create_effect( filter, value, count, i, *frequency ) == 0 ) diff --git a/src/modules/xml/producer_xml.c b/src/modules/xml/producer_xml.c index b7bfed81..4767ae31 100644 --- a/src/modules/xml/producer_xml.c +++ b/src/modules/xml/producer_xml.c @@ -1575,7 +1575,7 @@ mlt_producer producer_xml_init( mlt_profile profile, mlt_service_type servtype, for ( i = mlt_properties_count( properties ) - 1; i >= 1; i -- ) { char *name = mlt_properties_get_name( properties, i ); - if ( mlt_properties_get_data( properties, name, NULL ) == service ) + if ( mlt_properties_get_data_at( properties, i, NULL ) == service ) { mlt_properties_set_data( properties, name, service, 0, NULL, NULL ); break; -- 2.39.2