fix AVOption processing on ffmpeg 0.8

diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
index 7d6141e7fb5855abaeb8d0d3adce0e7132fcf105..85d62d5edfa3f8e0aaf88b75172a18971733cc3b 100644 (file)
--- a/src/modules/avformat/consumer_avformat.c
+++ b/src/modules/avformat/consumer_avformat.c
@@ -394,7 +394,7 @@ static void apply_properties( void *obj, mlt_properties properties, int flags )
        for ( i = 0; i < count; i++ )
        {
                const char *opt_name = mlt_properties_get_name( properties, i );
-#if LIBAVUTIL_VERSION_INT > ((51<<16)+(7<<8)+0)
+#if LIBAVUTIL_VERSION_INT >= ((51<<16)+(10<<8)+0)
                const AVOption *opt = av_opt_find( obj, opt_name, NULL, flags, flags );
 #else
                const AVOption *opt = av_find_opt( obj, opt_name, NULL, flags, flags );
@@ -404,7 +404,7 @@ static void apply_properties( void *obj, mlt_properties properties, int flags )
                if ( !opt && (
                        ( opt_name[0] == 'v' && ( flags & AV_OPT_FLAG_VIDEO_PARAM ) ) ||
                        ( opt_name[0] == 'a' && ( flags & AV_OPT_FLAG_AUDIO_PARAM ) ) ) )
-#if LIBAVUTIL_VERSION_INT > ((51<<16)+(7<<8)+0)
+#if LIBAVUTIL_VERSION_INT >= ((51<<16)+(10<<8)+0)
                        opt = av_opt_find( obj, ++opt_name, NULL, flags, flags );
 #else
                        opt = av_find_opt( obj, ++opt_name, NULL, flags, flags );

diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c
index c94080dd06483062bd1e1ff40142bfa3057b93a4..103fcae5992271398de222b851d4ed7ad9456c26 100644 (file)
--- a/src/modules/avformat/producer_avformat.c
+++ b/src/modules/avformat/producer_avformat.c
@@ -1799,7 +1799,7 @@ static void apply_properties( void *obj, mlt_properties properties, int flags )
        for ( i = 0; i < count; i++ )
        {
                const char *opt_name = mlt_properties_get_name( properties, i );
-#if LIBAVUTIL_VERSION_INT > ((51<<16)+(7<<8)+0)
+#if LIBAVUTIL_VERSION_INT >= ((51<<16)+(10<<8)+0)
                const AVOption *opt = av_opt_find( obj, opt_name, NULL, flags, flags );
 #else
                const AVOption *opt = av_find_opt( obj, opt_name, NULL, flags, flags );