Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 4 Nov 2016 14:24:06 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r425324 - in head/x11-toolkits/nucleo: . files
Message-ID:  <201611041424.uA4EO67v068693@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Fri Nov  4 14:24:06 2016
New Revision: 425324
URL: https://svnweb.freebsd.org/changeset/ports/425324

Log:
  x11-toolkits/nucleo: oops, restore size check after r425305
  
  PR:		207547

Modified:
  head/x11-toolkits/nucleo/Makefile   (contents, props changed)
  head/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSink.cxx   (contents, props changed)

Modified: head/x11-toolkits/nucleo/Makefile
==============================================================================
--- head/x11-toolkits/nucleo/Makefile	Fri Nov  4 13:40:17 2016	(r425323)
+++ head/x11-toolkits/nucleo/Makefile	Fri Nov  4 14:24:06 2016	(r425324)
@@ -3,7 +3,7 @@
 
 PORTNAME=	nucleo
 PORTVERSION=	0.7.6
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://insitu.lri.fr/metisse/download/nucleo/
 

Modified: head/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSink.cxx
==============================================================================
--- head/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSink.cxx	Fri Nov  4 13:40:17 2016	(r425323)
+++ head/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSink.cxx	Fri Nov  4 14:24:06 2016	(r425324)
@@ -152,7 +152,7 @@
 +
 +    int got_packet = 0 ;
 +    int ret = avcodec_encode_video2(cctx, &pkt, picture, &got_packet) ;
-+    if (ret) {
++    if (ret < 0 || !got_packet || pkt.size <= 0) {
 +	 std::cerr << "ffmpegImageSink: avcodec_encode_video2 failed" << std::endl ;
  	 stop() ;
  	 return false ;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611041424.uA4EO67v068693>