svn commit: r376630 - head/multimedia/mjpegtools/files

[Antoine Brodin]

Author: antoine
Date: Fri Jan  9 17:58:46 2015
New Revision: 376630
URL: https://svnweb.freebsd.org/changeset/ports/376630
QAT: https://qat.redports.org/buildarchive/r376630/

Log:
  Allow building with libc++ r224926
  
  PR:		ports/196629
  Submitted by:	dim@

Added:
  head/multimedia/mjpegtools/files/patch-yuvdeinterlace_yuvdeinterlace.cc   (contents, props changed)

Added: head/multimedia/mjpegtools/files/patch-yuvdeinterlace_yuvdeinterlace.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/mjpegtools/files/patch-yuvdeinterlace_yuvdeinterlace.cc	Fri Jan  9 17:58:46 2015	(r376630)
@@ -0,0 +1,33 @@
+--- yuvdeinterlace/yuvdeinterlace.cc.orig	2009-09-19 18:16:47 UTC
++++ yuvdeinterlace/yuvdeinterlace.cc
+@@ -918,7 +918,7 @@ int
+ main (int argc, char *argv[])
+ {
+   int frame = 0;
+-  int errno = 0;
++  int error = 0;
+   int ss_h, ss_v;
+ 
+   deinterlacer YUVdeint;
+@@ -1009,10 +1009,10 @@ main (int argc, char *argv[])
+   y4m_init_frame_info (&YUVdeint.Y4MStream.oframeinfo);
+ 
+ /* open input stream */
+-  if ((errno = y4m_read_stream_header (YUVdeint.Y4MStream.fd_in,
++  if ((error = y4m_read_stream_header (YUVdeint.Y4MStream.fd_in,
+ 				       &YUVdeint.Y4MStream.istreaminfo)) != Y4M_OK)
+     {
+-      mjpeg_error_exit1 ("Couldn't read YUV4MPEG header: %s!", y4m_strerr (errno));
++      mjpeg_error_exit1 ("Couldn't read YUV4MPEG header: %s!", y4m_strerr (error));
+     }
+ 
+   /* get format information */
+@@ -1089,7 +1089,7 @@ main (int argc, char *argv[])
+   y4m_write_stream_header (YUVdeint.Y4MStream.fd_out, &YUVdeint.Y4MStream.ostreaminfo);
+ 
+   /* read every frame until the end of the input stream and process it */
+-  while (Y4M_OK == (errno = y4m_read_frame (YUVdeint.Y4MStream.fd_in,
++  while (Y4M_OK == (error = y4m_read_frame (YUVdeint.Y4MStream.fd_in,
+ 					    &YUVdeint.Y4MStream.istreaminfo,
+ 					    &YUVdeint.Y4MStream.iframeinfo, YUVdeint.inframe)))
+     {