X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fffmpeg.C;h=74b32cf115c2f176a711f098ff59344e5144b46b;hb=d26ed189093987978190ee07f485a4840746c13c;hp=547b7f074f1276262838c65b5d6d5f8a361ce424;hpb=26fe9e12d6d42ae8f7087ac7f08242769d77a84a;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C
index 547b7f07..74b32cf1 100644
--- a/cinelerra-5.1/cinelerra/ffmpeg.C
+++ b/cinelerra-5.1/cinelerra/ffmpeg.C
@@ -395,12 +395,11 @@ int FFStream::decode(AVFrame *frame)
 
 int FFStream::load_filter(AVFrame *frame)
 {
+	av_frame_unref(frame);
 	int ret = av_buffersrc_add_frame_flags(buffersrc_ctx,
 			frame, AV_BUFFERSRC_FLAG_KEEP_REF);
-	if( ret < 0 ) {
-		av_frame_unref(frame);
+	if( ret < 0 )
 		eprintf(_("av_buffersrc_add_frame_flags failed\n"));
-	}
 	return ret;
 }
 
@@ -418,6 +417,7 @@ int FFStream::read_filter(AVFrame *frame)
 
 int FFStream::read_frame(AVFrame *frame)
 {
+	av_frame_unref(frame);
 	if( !filter_graph || !buffersrc_ctx || !buffersink_ctx )
 		return decode(frame);
 	if( !fframe && !(fframe=av_frame_alloc()) ) {
@@ -511,7 +511,13 @@ int FFStream::seek(int64_t no, double rate)
 	double secs = pos < 0 ? 0. : pos / rate;
 	AVRational time_base = st->time_base;
 	int64_t tstmp = time_base.num > 0 ? secs * time_base.den/time_base.num : 0;
-	if( nudge != AV_NOPTS_VALUE ) tstmp += nudge;
+	if( !tstmp ) {
+		if( st->nb_index_entries > 0 ) tstmp = st->index_entries[0].timestamp;
+		else if( st->start_time != AV_NOPTS_VALUE ) tstmp = st->start_time;
+		else if( st->first_dts != AV_NOPTS_VALUE ) tstmp = st->first_dts;
+		else tstmp = INT64_MIN+1;
+	}
+	else if( nudge != AV_NOPTS_VALUE ) tstmp += nudge;
 	int idx = st->index;
 #if 0
 // seek all streams using the default timebase.
@@ -531,7 +537,9 @@ int FFStream::seek(int64_t no, double rate)
 	}
 	int ret = avformat_seek_file(fmt_ctx, st->index, -INT64_MAX, seek, INT64_MAX, flags);
 #else
-	int ret = av_seek_frame(fmt_ctx, idx, tstmp, AVSEEK_FLAG_ANY);
+// finds the first index frame below the target time
+	int flags = AVSEEK_FLAG_BACKWARD | AVSEEK_FLAG_ANY;
+	int ret = av_seek_frame(fmt_ctx, idx, tstmp, flags);
 #endif
 	int retry = MAX_RETRY;
 	while( ret >= 0 ) {