2c2fd3c257
In the past xbmc delivered its own ffmpeg source code with specific patches to address bugs found during the use of xbmc. For Helix the ffmpeg source code was removed, Helix uses a vanilla ffmpeg source tarball and applies this patchset on top of it. Downloaded from https://github.com/xbmc/FFmpeg/compare/FFmpeg:release/2.5...release/2.5-xbmc.patch [Thomas: use individual patches instead.] Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
55 lines
1.5 KiB
Diff
55 lines
1.5 KiB
Diff
From 7d7ce18ff0d24b586634fa6e631fa0eec7865aae Mon Sep 17 00:00:00 2001
|
|
From: elupus <elupus@xbmc.org>
|
|
Date: Tue, 1 Nov 2011 20:18:35 +0100
|
|
Subject: [PATCH 13/13] add public version of ff_read_frame_flush
|
|
|
|
We need this since we sometimes seek on the
|
|
input stream behind ffmpeg's back. After this
|
|
all data need to be flushed completely.
|
|
|
|
Patch part of the XBMC patch set for ffmpeg, downloaded from
|
|
https://github.com/xbmc/FFmpeg/.
|
|
|
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
---
|
|
libavformat/avformat.h | 5 +++++
|
|
libavformat/utils.c | 5 +++++
|
|
2 files changed, 10 insertions(+)
|
|
|
|
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
|
|
index 2e54ed1..3a9f292 100644
|
|
--- a/libavformat/avformat.h
|
|
+++ b/libavformat/avformat.h
|
|
@@ -2121,6 +2121,11 @@ int av_find_best_stream(AVFormatContext *ic,
|
|
int av_read_frame(AVFormatContext *s, AVPacket *pkt);
|
|
|
|
/**
|
|
+ * Clear out any buffered data in context
|
|
+ */
|
|
+void av_read_frame_flush(AVFormatContext *s);
|
|
+
|
|
+/**
|
|
* Seek to the keyframe at timestamp.
|
|
* 'timestamp' in 'stream_index'.
|
|
*
|
|
diff --git a/libavformat/utils.c b/libavformat/utils.c
|
|
index f4fb172..10dda18 100644
|
|
--- a/libavformat/utils.c
|
|
+++ b/libavformat/utils.c
|
|
@@ -1624,6 +1624,11 @@ void ff_read_frame_flush(AVFormatContext *s)
|
|
}
|
|
}
|
|
|
|
+void av_read_frame_flush(AVFormatContext *s)
|
|
+{
|
|
+ ff_read_frame_flush(s);
|
|
+}
|
|
+
|
|
void ff_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timestamp)
|
|
{
|
|
int i;
|
|
--
|
|
2.1.0
|
|
|