Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorSebastian Parborg <darkdefende@gmail.com>2021-06-10 03:38:28 +0300
committerJeroen Bakker <jeroen@blender.org>2021-06-30 10:41:16 +0300
commit444a8cbc2fd99f9311162a14d5309e7d87621afd (patch)
tree07b3ee47f2ccce1dd4e12b432cadc374fe48d6e4 /intern
parent7616f4ae57735a66720d440f42c476a256d02350 (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')
-rw-r--r--intern/ffmpeg/ffmpeg_compat.h20
1 files changed, 0 insertions, 20 deletions
diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h
index 6fefa164dc3..bb5b439d073 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