[FFmpeg-devel] [PATCH 2/3] lavf/matroskadec: fallback to generic seeking if resyncing fails while seeking

2017-12-08 Thread Rodger Combs 
---
 libavformat/matroskadec.c | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index b51f67af00..944ed795d5 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -3532,8 +3532,12 @@ static int matroska_read_seek(AVFormatContext *s, int 
stream_index,
 int64_t pos = avio_tell(matroska->ctx->pb);
 matroska_clear_queue(matroska);
 if ((ret = matroska_parse_cluster(matroska)) < 0) {
-if ((ret == AVERROR_EOF) || matroska_resync(matroska, pos) < 0)
+if (ret == AVERROR_EOF) {
 break;
+} else if(matroska_resync(matroska, pos) < 0) {
+index = -1;
+break;
+}
 }
 }
 }
-- 
2.15.1

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH 2/3] lavf/matroskadec: fallback to generic seeking if resyncing fails while seeking

2017-12-08 Thread Michael Niedermayer 
On Fri, Dec 08, 2017 at 06:45:35AM -0600, Rodger Combs wrote:
> ---
>  libavformat/matroskadec.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)

breaks fate-seek-mkv-codec-delay


[...]

-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Republics decline into democracies and democracies degenerate into
despotisms. -- Aristotle


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH 2/3] lavf/matroskadec: fallback to generic seeking if resyncing fails while seeking

2017-12-08 Thread Rodger Combs 
---
 libavformat/matroskadec.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 93a3ec4a07..2d23f2ee84 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -3531,8 +3531,10 @@ static int matroska_read_seek(AVFormatContext *s, int 
stream_index,
 int64_t pos = avio_tell(matroska->ctx->pb);
 matroska_clear_queue(matroska);
 if (matroska_parse_cluster(matroska) < 0) {
-if (matroska_resync(matroska, pos) < 0)
+if (matroska_resync(matroska, pos) < 0) {
+index = -1;
 break;
+}
 }
 }
 }
-- 
2.15.1

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel