[arch-commits] Commit in mpv/trunk (2 files)

Christian Hesse eworm at archlinux.org
Fri Nov 3 13:17:07 UTC 2017


    Date: Friday, November 3, 2017 @ 13:17:06
  Author: eworm
Revision: 265318

upgpkg: mpv 1:0.27.0-4

fix API (FS#56089)

Added:
  mpv/trunk/0003-demux_lavf-return-AVERROR_EOF-on-file-end.patch
Modified:
  mpv/trunk/PKGBUILD

------------------------------------------------------+
 0003-demux_lavf-return-AVERROR_EOF-on-file-end.patch |   26 +++++++++++++++++
 PKGBUILD                                             |    7 +++-
 2 files changed, 32 insertions(+), 1 deletion(-)

Added: 0003-demux_lavf-return-AVERROR_EOF-on-file-end.patch
===================================================================
--- 0003-demux_lavf-return-AVERROR_EOF-on-file-end.patch	                        (rev 0)
+++ 0003-demux_lavf-return-AVERROR_EOF-on-file-end.patch	2017-11-03 13:17:06 UTC (rev 265318)
@@ -0,0 +1,26 @@
+From e9dc4ac86f9dbd59147963d08ec8447bba3ed0bb Mon Sep 17 00:00:00 2001
+From: Daniel Kucera <daniel.kucera at gmail.com>
+Date: Mon, 23 Oct 2017 15:29:17 +0200
+Subject: [PATCH] demux_lavf: return AVERROR_EOF on file end
+
+Signed-off-by: Daniel Kucera <daniel.kucera at gmail.com>
+Signed-off-by: wm4 <wm4 at nowhere>
+
+Uses different style and different logic from original PR.
+---
+ demux/demux_lavf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
+index c11f7739e1..11fa1c59b6 100644
+--- a/demux/demux_lavf.c
++++ b/demux/demux_lavf.c
+@@ -242,7 +242,7 @@ static int mp_read(void *opaque, uint8_t *buf, int size)
+ 
+     MP_TRACE(demuxer, "%d=mp_read(%p, %p, %d), pos: %"PRId64", eof:%d\n",
+              ret, stream, buf, size, stream_tell(stream), stream->eof);
+-    return ret;
++    return ret ? ret : AVERROR_EOF;
+ }
+ 
+ static int64_t mp_seek(void *opaque, int64_t pos, int whence)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-03 13:05:24 UTC (rev 265317)
+++ PKGBUILD	2017-11-03 13:17:06 UTC (rev 265318)
@@ -6,7 +6,7 @@
 pkgname=mpv
 epoch=1
 pkgver=0.27.0
-pkgrel=3
+pkgrel=4
 _waf_version=1.8.12
 pkgdesc='a free, open source, and cross-platform media player'
 arch=('i686' 'x86_64')
@@ -24,10 +24,12 @@
 source=("$pkgname-$pkgver.tar.gz::https://github.com/mpv-player/$pkgname/archive/v$pkgver.tar.gz"
   '0001-opengl-backend-support-multiple-backends.patch'
   '0002-vaapi-Use-libva2-message-callbacks.patch'
+  '0003-demux_lavf-return-AVERROR_EOF-on-file-end.patch'
   "http://www.freehackers.org/~tnagy/release/waf-${_waf_version}")
 sha256sums=('341d8bf18b75c1f78d5b681480b5b7f5c8b87d97a0d4f53a5648ede9c219a49c'
   '609e0530f1b0cdb910dcffb5f62bf55936540e24105ce1b2daf1bd6291a7d58a'
   '3c3517f4f4c71e39e1e04ea440688fc8d7b3dc55e6bc0a9398d11a9b75bde07d'
+  '5de6c616428c87cf9b39d8ba24446d65d175050c083e1054194d93cf03d5816a'
   '01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b')
 
 prepare() {
@@ -39,6 +41,9 @@
   # vaapi: Use libva2 message callbacks
   patch -Np1 < "${srcdir}"/0002-vaapi-Use-libva2-message-callbacks.patch
 
+  # demux_lavf: return AVERROR_EOF on file end
+  patch -Np1 < "${srcdir}"/0003-demux_lavf-return-AVERROR_EOF-on-file-end.patch
+
   install -m755 "${srcdir}"/waf-${_waf_version} waf
 }
 


More information about the arch-commits mailing list