diff options
| author | Sebastian Parborg <darkdefende@gmail.com> | 2021-06-10 03:38:28 +0300 |
|---|---|---|
| committer | Sebastian Parborg <darkdefende@gmail.com> | 2021-06-11 15:05:07 +0300 |
| commit | c0367b19e20e7bd7ffe25588dee6466c1a8157e8 (patch) | |
| tree | a40363c40fd8810d677ac288ee719d07e9b41952 /intern/ffmpeg | |
| parent | 4adbe31e2fc98f982aed3d97505513750ec348d4 (diff) | |
Fix: VSE search in mpegts files would fail
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
Diffstat (limited to 'intern/ffmpeg')
| -rw-r--r-- | intern/ffmpeg/ffmpeg_compat.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h index ce4bfc7d5e2..17e2a7dc05b 100644 --- a/intern/ffmpeg/ffmpeg_compat.h +++ b/intern/ffmpeg/ffmpeg_compat.h @@ -93,26 +93,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) { /* Some videos do not have any pts values, use dts instead in those cases if |