Attachment 151473 Details for Bug 196629 – Fix multimedia/mjpegtools with libc++ r224926

[patch] Fix multimedia/mjpegtools with libc++ r224926

multimedia__mjpegtools-fix-errno-redefinition-1.diff (text/plain), 2.03 KB, created by Dimitry Andric on 2015-01-12 19:20:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2015-01-12 19:20:23 UTC

Size: 2.03 KB

patch

obsolete

>Index: multimedia/mjpegtools/files/patch-yuvdeinterlace__yuvdeinterlace.cc
>===================================================================
>--- multimedia/mjpegtools/files/patch-yuvdeinterlace__yuvdeinterlace.cc	(revision 0)
>+++ multimedia/mjpegtools/files/patch-yuvdeinterlace__yuvdeinterlace.cc	(working copy)
>@@ -0,0 +1,33 @@
>+--- yuvdeinterlace/yuvdeinterlace.cc.orig	2009-09-19 20:16:47.000000000 +0200
>++++ yuvdeinterlace/yuvdeinterlace.cc	2015-01-09 00:14:30.000000000 +0100
>+@@ -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)))
>+     {
>
>Property changes on: multimedia/mjpegtools/files/patch-yuvdeinterlace__yuvdeinterlace.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 196629: 151473