Fix for current cvs

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

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index 71cf4ce..e60ff28 100755 (executable)
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -40,7 +40,7 @@ else
 
        if [ "$cvs_ffmpeg" != "" ]
        then
-               [ ! -d "ffmpeg" ] && cvs -z9 -d:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg co -D "8/5/2004 15:30 CET" ffmpeg
+               [ ! -d "ffmpeg" ] && cvs -z9 -d:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg co -D "10/11/2004 20:30 CET" ffmpeg
                [ -d "ffmpeg" ] && ( cd ffmpeg ; ./configure )
                #[ ! -f "ffmpeg/ffmpeg.patch" ] && ( cd ffmpeg ; cp ../ffmpeg.patch . ; patch -p0 < ffmpeg.patch )
                echo "CFLAGS+=-I`pwd`/ffmpeg/libavformat -I`pwd`/ffmpeg/libavcodec" >> config.mak
@@ -62,7 +62,7 @@ else
                if [ -d "$shared_ffmpeg/include/ffmpeg" -a -f "$shared_ffmpeg/lib/libavformat.so" ]
                then
                        echo "CFLAGS+=-I$shared_ffmpeg/include/ffmpeg " >> config.mak
-                       echo "LDFLAGS+=-L$shared_ffmpeg" >> config.mak
+                       echo "LDFLAGS+=-L$shared_ffmpeg/lib" >> config.mak
                else
                        echo "avformat: No build environment found. "
                        echo "          Try configuring mlt with --avformat-cvs."

diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c
index 2d2e11b..85ee4a5 100644 (file)
--- a/src/modules/avformat/producer_avformat.c
+++ b/src/modules/avformat/producer_avformat.c
@@ -281,7 +281,7 @@ static int producer_open( mlt_producer this, char *file )
                        
                        // Check if we're seekable (something funny about mpeg here :-/)
                        if ( strcmp( file, "pipe:" ) && strncmp( file, "http://", 6 ) )
-                               mlt_properties_set_int( properties, "seekable", av_seek_frame( context, -1, mlt_properties_get_double( properties, "start_time" ) ) >= 0 );
+                               mlt_properties_set_int( properties, "seekable", av_seek_frame( context, -1, mlt_properties_get_double( properties, "start_time" ), AVSEEK_FLAG_BACKWARD ) >= 0 );
                        else
                                av_bypass = 1;
 
@@ -517,7 +517,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
                else if ( seekable && ( position < expected || position - expected >= 12 ) )
                {
                        // Set to the real timecode
-                       av_seek_frame( context, -1, mlt_properties_get_double( properties, "start_time" ) + real_timecode * 1000000.0 );
+                       av_seek_frame( context, -1, mlt_properties_get_double( properties, "start_time" ) + real_timecode * 1000000.0, AVSEEK_FLAG_BACKWARD );
        
                        // Remove the cached info relating to the previous position
                        mlt_properties_set_double( properties, "current_time", real_timecode );
@@ -818,7 +818,7 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
                else if ( position < expected || position - expected >= 12 )
                {
                        // Set to the real timecode
-                       if ( av_seek_frame( context, -1, mlt_properties_get_double( properties, "start_time" ) + real_timecode * 1000000.0 ) != 0 )
+                       if ( av_seek_frame( context, -1, mlt_properties_get_double( properties, "start_time" ) + real_timecode * 1000000.0, AVSEEK_FLAG_BACKWARD ) != 0 )
                                paused = 1;
 
                        // Clear the usage in the audio buffer