[arch-commits] Commit in libopenshot/trunk (PKGBUILD ffmpeg-4.0.patch)

[Florian Pritz]

    Date: Wednesday, May 9, 2018 @ 11:12:42
  Author: bluewind
Revision: 319834

upgpkg: libopenshot 0.1.9-7

Fix compile error in ffmpeg 4.0 patch

Modified:
  libopenshot/trunk/PKGBUILD
  libopenshot/trunk/ffmpeg-4.0.patch

------------------+
 PKGBUILD         |    4 ++--
 ffmpeg-4.0.patch |    8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-09 10:47:18 UTC (rev 319833)
+++ PKGBUILD	2018-05-09 11:12:42 UTC (rev 319834)
@@ -5,7 +5,7 @@
 
 pkgname=libopenshot
 pkgver=0.1.9
-pkgrel=6
+pkgrel=7
 pkgdesc="A high quality, open-source video editing, animation, and playback library for C++, Python, and Ruby."
 arch=('x86_64')
 url="http://openshot.org/"
@@ -18,7 +18,7 @@
 sha256sums=('2547969818092d77a1c742e27cf416b34b4d326abf6b089fc10b921f4a4141ec'
             'e0f56d40d4df0e4278d3cdb81923652b467c1a30e408bcff7a6b15327fb03548'
             '7dca1cfcdbc8c8cd039b6267623c822230e0d37968be2372520b36e22c782dd8'
-            '5fcde03d9c04e4c3526f5b449171d1b42c572d1c882d1aeb2a4eb014b2c74137')
+            'bfc6aa2752a053774b0c46d0339b41df68f8e63765f1185f0df596ecbd3633a8')
 
 prepare() {
 	cd ${pkgname}-${pkgver}

Modified: ffmpeg-4.0.patch
===================================================================
--- ffmpeg-4.0.patch	2018-05-09 10:47:18 UTC (rev 319833)
+++ ffmpeg-4.0.patch	2018-05-09 11:12:42 UTC (rev 319834)
@@ -12,17 +12,19 @@
  
      int error_code = 0;
      int stop_encoding = 1;
-@@ -958,7 +960,9 @@
+@@ -958,7 +960,11 @@
          if (strcmp(fmt->name, "gif") != 0)
  			// If not GIF format, skip the encoding process
  			// Set raw picture flag (so we don't encode this video)
 +#ifdef AVFMT_RAWPICTURE
  			oc->oformat->flags |= AVFMT_RAWPICTURE;
++#else
++			((void)0);
 +#endif
          } else {
          	// Set the default codec
          	c->pix_fmt = PIX_FMT_YUV420P;
-@@ -966,7 +970,9 @@
+@@ -966,7 +972,9 @@
      }
  
  	AV_COPY_PARAMS_FROM_CONTEXT(st, c);
@@ -32,7 +34,7 @@
  
  	return st;
  }
-@@ -1519,9 +1525,13 @@
+@@ -1519,9 +1527,13 @@
  // write video frame
  bool FFmpegWriter::write_video_packet(std::shared_ptr<Frame> frame, AVFrame* frame_final)
  {