diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2019-08-17 21:04:33 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2019-08-17 21:04:33 +0000 |
| commit | 662ef3d579c391b2295e0485cc849b9f32f962ee (patch) | |
| tree | 1a5f8d1ba7289471f8d469135d6278a6ab685ab6 /multimedia | |
| parent | lang/rust-nightly: unbreak cargo git fetch after r507928 (diff) | |
multimedia/ffmpeg: unbreak mkv seeking beyond 2gb after r508216
PR: 239905
Reported by: naddy
Obtained from: upstream (release/4.2 branch)
Notes
Notes:
svn path=/head/; revision=509174
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/ffmpeg/files/patch-libavformat_matroskadec.c | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 08b9b3d8ba47..6bf008943e78 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -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/ diff --git a/multimedia/ffmpeg/files/patch-libavformat_matroskadec.c b/multimedia/ffmpeg/files/patch-libavformat_matroskadec.c new file mode 100644 index 000000000000..f37cb5265658 --- /dev/null +++ b/multimedia/ffmpeg/files/patch-libavformat_matroskadec.c @@ -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; + } |