Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 2 May 2018 13:31:46 +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: r468835 - head/cad/netgen/files
Message-ID:  <201805021331.w42DVksW049855@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Wed May  2 13:31:46 2018
New Revision: 468835
URL: https://svnweb.freebsd.org/changeset/ports/468835

Log:
  multimedia/webcamoid: unbreak with ffmpeg 4.0
  
  ngpkg.cpp:2342:27: error: use of undeclared identifier 'CODEC_FLAG_PSNR'
          context->flags |= CODEC_FLAG_PSNR;
                            ^
  
  PR:		227726
  Reported by:	antoine (via exp-run)

Modified:
  head/cad/netgen/files/patch-ng_ngpkg.cpp   (contents, props changed)

Modified: head/cad/netgen/files/patch-ng_ngpkg.cpp
==============================================================================
--- head/cad/netgen/files/patch-ng_ngpkg.cpp	Wed May  2 13:26:36 2018	(r468834)
+++ head/cad/netgen/files/patch-ng_ngpkg.cpp	Wed May  2 13:31:46 2018	(r468835)
@@ -9,15 +9,17 @@
      static FILE *MPGfile;
      static buffer_t buff;
      static struct SwsContext *img_convert_ctx;
-@@ -2338,7 +2338,7 @@ namespace netgen
+@@ -2338,8 +2338,8 @@ namespace netgen
          context->time_base = s;
          context->gop_size = gopsize;
          context->max_b_frames = bframes;
 -        context->pix_fmt = PIX_FMT_YUV420P;
+-        context->flags |= CODEC_FLAG_PSNR;
 +        context->pix_fmt = AV_PIX_FMT_YUV420P;
-         context->flags |= CODEC_FLAG_PSNR;
++        context->flags |= AV_CODEC_FLAG_PSNR;
  
          // if( avcodec_open( context, codec ) < 0 ) {
+ 	if( avcodec_open2( context, codec, NULL) < 0 ) {
 @@ -2351,7 +2351,7 @@ namespace netgen
            return TCL_ERROR;
          }



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