avformat/configure: fix compiling against shared ffmpeg due to changes in ffmpeg...

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

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index 284d10e5507617ec29629d2f85de904d36a57e10..a57172a420a86e8e1eceb7216572a19b6d912518 100755 (executable)
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -121,9 +121,16 @@ else
                fi
        elif [ "$shared_ffmpeg" != "" ]
        then
-               echo "CFLAGS+=$(pkg-config --cflags libavformat)" >> config.mak
+               echo "PREFIX=$shared_ffmpeg" >> config.mak
+               echo "CFLAGS+=$(pkg-config --cflags libavformat) $TMP_CFLAGS" >> config.mak
                echo "LDFLAGS+=$(pkg-config --libs libavformat)" >> config.mak
-               [ "$swscale" != "" ] && echo "SWSCALE=1" >> config.mak
+               [ -d "$shared_ffmpeg/include/libavformat" ] &&
+                       echo "CFLAGS+=-I$shared_ffmpeg/include/libavformat -I$shared_ffmpeg/include/libavcodec" >> config.mak
+               if [ "$swscale" != "" ]
+               then
+                       echo "CFLAGS+=-I$shared_ffmpeg/include/libswscale" >> config.mak
+                       echo "SWSCALE=1" >> config.mak
+               fi
        else
                echo "avformat: No build environment found. "
                echo "          Try configuring mlt with --avformat-svn."
@@ -135,4 +142,3 @@ else
        echo "AVFORMAT_SUFFIX=$avformat_suffix" >> config.mak
 
 fi
-

diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
index d2c6fe137f33ea32be1268c7454d92f9e6f69dfc..260f9286ed514b607d9497025024d77cd235bb8d 100644 (file)
--- a/src/modules/avformat/consumer_avformat.c
+++ b/src/modules/avformat/consumer_avformat.c
@@ -429,7 +429,7 @@ static AVStream *add_video_stream( mlt_consumer this, AVFormatContext *oc, int c
        if ( st != NULL ) 
        {
                char *pix_fmt = mlt_properties_get( properties, "pix_fmt" );
-               double ar = mlt_properties_get_double( properties, "display_ratio" );
+               double ar = mlt_properties_get_double( properties, "aspect_ratio" );
                AVCodecContext *c = st->codec;
 
                // Establish defaults from AVOptions