Hello community, here is the log from the commit of package libmlt for openSUSE:Factory checked in at 2012-10-03 08:00:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmlt (Old) and /work/SRC/openSUSE:Factory/.libmlt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libmlt", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libmlt/libmlt.changes 2012-09-01 10:31:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libmlt.new/libmlt.changes 2012-10-03 08:00:18.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Oct 1 13:28:16 UTC 2012 - [email protected] + +- Add libmlt-0.8.2-ffmpeg1.patch to fix build with ffmpeg 1.0 + +------------------------------------------------------------------- New: ---- libmlt-0.8.2-ffmpeg1.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmlt.spec ++++++ --- /var/tmp/diff_new_pack.xrZ9DR/_old 2012-10-03 08:00:20.000000000 +0200 +++ /var/tmp/diff_new_pack.xrZ9DR/_new 2012-10-03 08:00:20.000000000 +0200 @@ -40,6 +40,8 @@ Patch1: libmlt-0.8.2-vdpau.patch # PATCH-FIX-UPSTREAM libmlt-0.8.0-vdpau.patch sf#3555214 [email protected] -- Install modules and data in versioned directories Patch2: libmlt-0.8.0-versioned_dirs.patch +# PATCH-FIX-UPSTREAM libmlt-0.8.2-ffmpeg1.patch [email protected] -- Build with ffmpeg 1.0. Taken from upstream GIT. +Patch3: libmlt-0.8.2-ffmpeg1.patch BuildRequires: gcc-c++ BuildRequires: ladspa-devel BuildRequires: pkg-config @@ -190,6 +192,7 @@ %patch0 %patch1 %patch2 +%patch3 # To complement libmlt-0.8.0-vdpau.patch. # When vdpau support is not compiled it will break the code. Doesn't matter because the code will not be used anyway. ++++++ libmlt-0.8.2-ffmpeg1.patch ++++++ Index: src/modules/avformat/consumer_avformat.c =================================================================== --- src/modules/avformat/consumer_avformat.c.orig +++ src/modules/avformat/consumer_avformat.c @@ -237,10 +237,12 @@ static int consumer_start( mlt_consumer mlt_properties_set_data( properties, "acodec", codecs, 0, (mlt_destructor) mlt_properties_close, NULL ); mlt_properties_set_data( doc, "audio_codecs", codecs, 0, NULL, NULL ); while ( ( codec = av_codec_next( codec ) ) ) -#if LIBAVCODEC_VERSION_INT >= ((54<<16)+(0<<8)+0) - if ( ( codec->encode || codec->encode2 ) && codec->type == CODEC_TYPE_AUDIO ) +#if (defined(FFUDIV) && LIBAVCODEC_VERSION_INT >= ((54<<16)+(56<<8)+100)) || (LIBAVCODEC_VERSION_INT >= ((54<<16)+(27<<8)+0)) + if ( codec->encode2 && codec->type == CODEC_TYPE_AUDIO ) +#elif LIBAVCODEC_VERSION_INT >= ((54<<16)+(0<<8)+0) + if ( ( codec->encode || codec->encode2 ) && codec->type == CODEC_TYPE_AUDIO ) #else - if ( codec->encode && codec->type == CODEC_TYPE_AUDIO ) + if ( codec->encode && codec->type == CODEC_TYPE_AUDIO ) #endif { snprintf( key, sizeof(key), "%d", mlt_properties_count( codecs ) ); @@ -261,10 +263,12 @@ static int consumer_start( mlt_consumer mlt_properties_set_data( properties, "vcodec", codecs, 0, (mlt_destructor) mlt_properties_close, NULL ); mlt_properties_set_data( doc, "video_codecs", codecs, 0, NULL, NULL ); while ( ( codec = av_codec_next( codec ) ) ) -#if LIBAVCODEC_VERSION_INT >= ((54<<16)+(0<<8)+0) - if ( (codec->encode || codec->encode2) && codec->type == CODEC_TYPE_VIDEO ) +#if (defined(FFUDIV) && LIBAVCODEC_VERSION_INT >= ((54<<16)+(56<<8)+100)) || (LIBAVCODEC_VERSION_INT >= ((54<<16)+(27<<8)+0)) + if ( codec->encode2 && codec->type == CODEC_TYPE_VIDEO ) +#elif LIBAVCODEC_VERSION_INT >= ((54<<16)+(0<<8)+0) + if ( (codec->encode || codec->encode2) && codec->type == CODEC_TYPE_VIDEO ) #else - if ( codec->encode && codec->type == CODEC_TYPE_VIDEO ) + if ( codec->encode && codec->type == CODEC_TYPE_VIDEO ) #endif { snprintf( key, sizeof(key), "%d", mlt_properties_count( codecs ) ); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
