Am 20.08.2012 05:20, schrieb Dan Dennedy:
> I want to make a new release since there a number of bug fixes and
> improvements. If you are distribution maintainer, it would be good to
> test a git snapshot to see if there are any build problems before the
> release. Thanks!
> 

Thanks for pinging!

It builds fine, but the attached patch still applies, so users with
newer libav/ffmpeg without using this patch are still affected. Sure
this patch is not for upstream relevant since it is another hardcoded
foo which will break mlt on older libav/ffmpeg scenarios..

-- 
/*
Mit freundlichem Gruß / With kind regards,
 Patrick Matthäi
 GNU/Linux Debian Developer

  Blog: http://www.linux-dev.org/
E-Mail: pmatth...@debian.org
        patr...@linux-dev.org
*/
# The path and naming schema of the preset files has been changed from:
# /usr/share/ffpresets/*.ffpreset
# to:
# /usr/share/avconv/*.avpreset
# Closes: #681339

diff -Naur mlt-0.8.0.orig/src/modules/avformat/configure mlt-0.8.0/src/modules/avformat/configure
--- mlt-0.8.0.orig/src/modules/avformat/configure	2012-06-01 22:51:32.000000000 +0200
+++ mlt-0.8.0/src/modules/avformat/configure	2012-07-12 21:41:31.506776608 +0200
@@ -86,7 +86,7 @@
 	then 
 		if [ -d "$static_ffmpeg" ]
 		then
-			echo "CFLAGS+=-DAVDATADIR=\\\"${static_ffmpeg}/ffpresets/\\\"" >> config.mak
+			echo "CFLAGS+=-DAVDATADIR=\\\"${static_ffmpeg}/avconv/\\\"" >> config.mak
 			echo "CFLAGS+=-I$static_ffmpeg" >> config.mak
 			echo "LDFLAGS+=-L$static_ffmpeg/libavformat -L$static_ffmpeg/libavcodec -L$static_ffmpeg/libavutil" >> config.mak
 			[ $targetos = "Darwin" ] &&
diff -Naur mlt-0.8.0.orig/src/modules/avformat/consumer_avformat.c mlt-0.8.0/src/modules/avformat/consumer_avformat.c
--- mlt-0.8.0.orig/src/modules/avformat/consumer_avformat.c	2012-06-01 22:51:32.000000000 +0200
+++ mlt-0.8.0/src/modules/avformat/consumer_avformat.c	2012-07-12 21:42:49.242780570 +0200
@@ -731,12 +731,12 @@
 				AVCodec *codec = avcodec_find_encoder( c->codec_id );
 				if ( codec )
 				{
-					char *path = malloc( strlen(AVDATADIR) + strlen(codec->name) + strlen(vpre) + strlen(".ffpreset") + 2 );
+					char *path = malloc( strlen(AVDATADIR) + strlen(codec->name) + strlen(vpre) + strlen(".avpreset") + 2 );
 					strcpy( path, AVDATADIR );
 					strcat( path, codec->name );
 					strcat( path, "-" );
 					strcat( path, vpre );
-					strcat( path, ".ffpreset" );
+					strcat( path, ".avpreset" );
 					
 					mlt_properties_close( p );
 					p = mlt_properties_load( path );

Attachment: signature.asc
Description: OpenPGP digital signature

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Mlt-devel mailing list
Mlt-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mlt-devel

Reply via email to