Re: [Mlt-devel] prepare to release MLT 0.8.2

[Patrick M. <pma...@de...>]

Am 20.08.2012 18:01, schrieb Patrick Matthäi:
> 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..

Hi Dan,

old but up to date topic I think.
I am missing something or is the patch still required? mlt 0.9.0 still 
hardcoded the .ffpreset paths.

Patch:

diff -Naur mlt-0.9.0.orig/src/modules/avformat/configure 
mlt-0.9.0/src/modules/avformat/configure
--- mlt-0.9.0.orig/src/modules/avformat/configure       2013-06-03 
05:34:35.000000000 +0200
+++ mlt-0.9.0/src/modules/avformat/configure    2013-06-04 
11:50:18.832675538 +0200
@@ -84,7 +84,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
                         echo "LDFLAGS+=-L$static_ffmpeg/libswscale" >> 
config.mak
diff -Naur mlt-0.9.0.orig/src/modules/avformat/consumer_avformat.c 
mlt-0.9.0/src/modules/avformat/consumer_avformat.c
--- mlt-0.9.0.orig/src/modules/avformat/consumer_avformat.c 
2013-06-03 05:34:35.000000000 +0200
+++ mlt-0.9.0/src/modules/avformat/consumer_avformat.c  2013-06-04 
11:51:04.280674956 +0200
@@ -783,12 +783,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 );



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

   Blog: http://www.linux-dev.org/
E-Mail: pma...@de...
         pa...@li...
*/