From b4db352cab396eb5179e2deaf58bb05dcdfb0c69 Mon Sep 17 00:00:00 2001 From: lilo_booter Date: Thu, 5 Aug 2004 13:32:20 +0000 Subject: [PATCH] gop size == 0 fix and update to current ffmpeg for cvs co git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@354 d19143bc-622f-0410-bfdd-b5b2a6649095 --- src/modules/avformat/configure | 4 ++-- src/modules/avformat/producer_avformat.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure index cf7388b..3be869f 100755 --- a/src/modules/avformat/configure +++ b/src/modules/avformat/configure @@ -40,9 +40,9 @@ else if [ "$cvs_ffmpeg" != "" ] then - [ ! -d "ffmpeg" ] && cvs -z9 -d:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg co -D "6/7/2004 17:00 CET" ffmpeg + [ ! -d "ffmpeg" ] && cvs -z9 -d:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg co -D "8/5/2004 15:30 CET" ffmpeg [ -d "ffmpeg" ] && ( cd ffmpeg ; ./configure ) - [ ! -f "ffmpeg/ffmpeg.patch" ] && ( cd ffmpeg ; cp ../ffmpeg.patch . ; patch -p0 < ffmpeg.patch ) + #[ ! -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 echo "LDFLAGS+=-L`pwd`/ffmpeg/libavformat -L`pwd`/ffmpeg/libavcodec" >> config.mak echo "LOCAL_FFMPEG=1" >> config.mak diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c index 75f4ead..ea262d8 100644 --- a/src/modules/avformat/producer_avformat.c +++ b/src/modules/avformat/producer_avformat.c @@ -424,7 +424,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form // Fast forward - seeking is inefficient for small distances - just ignore following frames ignore = position - expected; } - else if ( position < expected || position - expected >= 12 ) + else if ( codec_context->gop_size == 0 || ( 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 ); -- 1.7.4.4