From: ddennedy <ddennedy@d19143bc-622f-0410-bfdd-b5b2a6649095>
Date: Fri, 26 Dec 2008 06:58:43 +0000 (+0000)
Subject: producer_avformat.c, consumer_avformat.c: use av_set_string3 where available (gets... 
X-Git-Url: http://research.m1stereo.tv/gitweb?a=commitdiff_plain;h=b368e2047380b1de3fe454a011d7a84e4cf49cee;p=melted

producer_avformat.c, consumer_avformat.c: use av_set_string3 where available (gets rid of deprecation warning).

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@1288 d19143bc-622f-0410-bfdd-b5b2a6649095
---

diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
index 10019ef..87e3f5f 100644
--- a/src/modules/avformat/consumer_avformat.c
+++ b/src/modules/avformat/consumer_avformat.c
@@ -315,7 +315,9 @@ static void apply_properties( void *obj, mlt_properties properties, int flags )
 		const char *opt_name = mlt_properties_get_name( properties, i );
 		const AVOption *opt = av_find_opt( obj, opt_name, NULL, flags, flags );
 		if ( opt != NULL )
-#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(59<<8)+0)
+#if LIBAVCODEC_VERSION_INT >= ((52<<16)+(7<<8)+0)
+			av_set_string3( obj, opt_name, mlt_properties_get( properties, opt_name), 0, NULL );
+#elif LIBAVCODEC_VERSION_INT >= ((51<<16)+(59<<8)+0)
 			av_set_string2( obj, opt_name, mlt_properties_get( properties, opt_name), 0 );
 #else
 			av_set_string( obj, opt_name, mlt_properties_get( properties, opt_name) );
diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c
index 3f27862..14a97bf 100644
--- a/src/modules/avformat/producer_avformat.c
+++ b/src/modules/avformat/producer_avformat.c
@@ -849,7 +849,9 @@ static void apply_properties( void *obj, mlt_properties properties, int flags )
 		const char *opt_name = mlt_properties_get_name( properties, i );
 		const AVOption *opt = av_find_opt( obj, opt_name, NULL, flags, flags );
 		if ( opt != NULL )
-#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(59<<8)+0)
+#if LIBAVCODEC_VERSION_INT >= ((52<<16)+(7<<8)+0)
+			av_set_string3( obj, opt_name, mlt_properties_get( properties, opt_name), 0, NULL );
+#elif LIBAVCODEC_VERSION_INT >= ((51<<16)+(59<<8)+0)
 			av_set_string2( obj, opt_name, mlt_properties_get( properties, opt_name), 0 );
 #else
 			av_set_string( obj, opt_name, mlt_properties_get( properties, opt_name) );