archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix: VSE search in mpegts files would fail

Browse Source 
ffmpeg_generic_seek_workaround did work properly and our start pts
calculation was wrong.

Reviewed By: Richard Antalik

Differential Revision: http://developer.blender.org/D11562
This commit is contained in:
Sebastian Parborg
2021-06-10 02:38:28 +02:00
parent 4adbe31e2f
commit c0367b19e2
2 changed files with 57 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
intern/ffmpeg/ffmpeg_compat.h
View File

@@ -92,26 +92,6 @@ void my_guess_pkt_duration(AVFormatContext *s, AVStream *st, AVPacket *pkt)
}
#endif
FFMPEG_INLINE
void my_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timestamp)
{
int i;
for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i];
st->cur_dts = av_rescale(timestamp,
st->time_base.den * (int64_t)ref_st->time_base.num,
st->time_base.num * (int64_t)ref_st->time_base.den);
}
}
FFMPEG_INLINE
void av_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timestamp)
{
my_update_cur_dts(s, ref_st, timestamp);
}
FFMPEG_INLINE
int64_t timestamp_from_pts_or_dts(int64_t pts, int64_t dts)
{