aboutsummaryrefslogtreecommitdiff
path: root/lib/ffmpeg
diff options
context:
space:
mode:
authorRainer Hochecker <fernetmenta@online.de>2014-03-08 15:38:44 +0100
committerRainer Hochecker <fernetmenta@online.de>2014-03-08 15:38:44 +0100
commitcaff317105ac704cd546337aefb57502f319353b (patch)
treec3f66b6991b16fa7c441ee08e5e8b5ce1ff352bd /lib/ffmpeg
parenta4f997b71e20a732d8a782b2498c3abb544e94d8 (diff)
ffmpeg backport for assettion in wma
Diffstat (limited to 'lib/ffmpeg')
-rw-r--r--lib/ffmpeg/patches/0071-ffmpeg-backport-avformat-asfdec-call-read-frame-flush.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/lib/ffmpeg/patches/0071-ffmpeg-backport-avformat-asfdec-call-read-frame-flush.patch b/lib/ffmpeg/patches/0071-ffmpeg-backport-avformat-asfdec-call-read-frame-flush.patch
new file mode 100644
index 0000000000..5198548a4e
--- /dev/null
+++ b/lib/ffmpeg/patches/0071-ffmpeg-backport-avformat-asfdec-call-read-frame-flush.patch
@@ -0,0 +1,30 @@
+From 4b101ab02ea762f70903e894a4b002b229526a4a Mon Sep 17 00:00:00 2001
+From: Michael Niedermayer <michaelni@gmx.at>
+Date: Mon, 12 Aug 2013 22:52:23 +0200
+Subject: [PATCH] avformat/asfdec: call ff_read_frame_flush() in asf_read_pts()
+
+flushing just the asf demuxer but not the cores buffers leads to inconsistencies
+and a "random" packet position which later causes an assertion failure
+
+Fixes Ticket2853
+
+Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
+---
+ libavformat/asfdec.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
+index cffbcc4..0d6370d 100644
+--- a/libavformat/asfdec.c
++++ b/libavformat/asfdec.c
+@@ -1414,6 +1414,7 @@ static int64_t asf_read_pts(AVFormatContext *s, int stream_index,
+ if (avio_seek(s->pb, pos, SEEK_SET) < 0)
+ return AV_NOPTS_VALUE;
+
++ ff_read_frame_flush(s);
+ asf_reset_header(s);
+ for (;;) {
+ if (av_read_frame(s, pkt) < 0) {
+--
+1.8.5.5
+