svn commit: r509174 - in head/multimedia/ffmpeg: . files

[Jan Beich]

Author: jbeich
Date: Sat Aug 17 21:04:33 2019
New Revision: 509174
URL: https://svnweb.freebsd.org/changeset/ports/509174

Log:
  multimedia/ffmpeg: unbreak mkv seeking beyond 2gb after r508216
  
  PR:		239905
  Reported by:	naddy
  Obtained from:	upstream (release/4.2 branch)

Added:
  head/multimedia/ffmpeg/files/patch-libavformat_matroskadec.c   (contents, props changed)
Modified:
  head/multimedia/ffmpeg/Makefile   (contents, props changed)

Modified: head/multimedia/ffmpeg/Makefile
==============================================================================
--- head/multimedia/ffmpeg/Makefile	Sat Aug 17 21:04:21 2019	(r509173)
+++ head/multimedia/ffmpeg/Makefile	Sat Aug 17 21:04:33 2019	(r509174)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	4.2
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	https://ffmpeg.org/releases/

Added: head/multimedia/ffmpeg/files/patch-libavformat_matroskadec.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/ffmpeg/files/patch-libavformat_matroskadec.c	Sat Aug 17 21:04:33 2019	(r509174)
@@ -0,0 +1,13 @@
+https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/299e0dff1fbc
+
+--- libavformat/matroskadec.c.orig	2019-08-05 20:52:21 UTC
++++ libavformat/matroskadec.c
+@@ -757,7 +757,7 @@ static int matroska_reset_status(MatroskaDemuxContext 
+                                  uint32_t id, int64_t position)
+ {
+     if (position >= 0) {
+-        int err = avio_seek(matroska->ctx->pb, position, SEEK_SET);
++        int64_t err = avio_seek(matroska->ctx->pb, position, SEEK_SET);
+         if (err < 0)
+             return err;
+     }