From owner-svn-ports-head@freebsd.org Fri Apr 27 14:56:16 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BBB2DFA99D9; Fri, 27 Apr 2018 14:56:16 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6D17A69081; Fri, 27 Apr 2018 14:56:16 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 67F5427EC1; Fri, 27 Apr 2018 14:56:16 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3REuG6W045959; Fri, 27 Apr 2018 14:56:16 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3REuGD0045958; Fri, 27 Apr 2018 14:56:16 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804271456.w3REuGD0045958@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 27 Apr 2018 14:56:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468433 - head/multimedia/motion/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/multimedia/motion/files X-SVN-Commit-Revision: 468433 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Apr 2018 14:56:17 -0000 Author: jbeich Date: Fri Apr 27 14:56:16 2018 New Revision: 468433 URL: https://svnweb.freebsd.org/changeset/ports/468433 Log: multimedia/motion: unbreak with ffmpeg 4.0 ffmpeg.c:442:25: error: use of undeclared identifier 'CODEC_FLAG_QSCALE' c->flags |= CODEC_FLAG_QSCALE; ^ ffmpeg.c:450:17: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER' c->flags |= CODEC_FLAG_GLOBAL_HEADER; ^ ffmpeg.c:492:40: error: use of undeclared identifier 'AVFMT_RAWPICTURE' if (!(ffmpeg->oc->oformat->flags & AVFMT_RAWPICTURE)) { ^ ffmpeg.c:708:38: error: use of undeclared identifier 'AVFMT_RAWPICTURE' if (ffmpeg->oc->oformat->flags & AVFMT_RAWPICTURE) { ^ PR: 227726 Added: head/multimedia/motion/files/patch-ffmpeg.c (contents, props changed) Added: head/multimedia/motion/files/patch-ffmpeg.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/motion/files/patch-ffmpeg.c Fri Apr 27 14:56:16 2018 (r468433) @@ -0,0 +1,53 @@ +Upstream fix from 4.1.* causes too many merge conflicts. +https://github.com/Motion-Project/motion/commit/b5c3a73cc62e +https://github.com/Motion-Project/motion/commit/9b93a417e37e + +--- ffmpeg.c.orig 2016-10-25 01:39:24 UTC ++++ ffmpeg.c +@@ -439,7 +439,7 @@ struct ffmpeg *ffmpeg_open(const char *ffmpeg_video_co + /* The selection of 8000 in the else is a subjective number based upon viewing output files */ + if (vbr > 0){ + ffmpeg->vbr =(int)(((100-vbr)*(100-vbr)*(100-vbr) * 8000) / 1000000) + 1; +- c->flags |= CODEC_FLAG_QSCALE; ++ c->flags |= AV_CODEC_FLAG_QSCALE; + c->global_quality=ffmpeg->vbr; + } + } +@@ -447,7 +447,7 @@ struct ffmpeg *ffmpeg_open(const char *ffmpeg_video_co + MOTION_LOG(INF, TYPE_ENCODER, NO_ERRNO, "%s vbr/crf for codec: %d", ffmpeg->vbr); + + if (strcmp(ffmpeg_video_codec, "ffv1") == 0) c->strict_std_compliance = -2; +- c->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + + retcd = avcodec_open2(c, codec, &opts); + if (retcd < 0) { +@@ -489,7 +489,10 @@ struct ffmpeg *ffmpeg_open(const char *ffmpeg_video_co + } + + ffmpeg->video_outbuf = NULL; +- if (!(ffmpeg->oc->oformat->flags & AVFMT_RAWPICTURE)) { ++#ifdef AVFMT_RAWPICTURE ++ if (!(ffmpeg->oc->oformat->flags & AVFMT_RAWPICTURE)) ++#endif ++ { + ffmpeg->video_outbuf_size = ffmpeg->c->width * 512; + ffmpeg->video_outbuf = mymalloc(ffmpeg->video_outbuf_size); + } +@@ -705,12 +708,15 @@ int ffmpeg_put_frame(struct ffmpeg *ffmpeg, AVFrame *p + gettimeofday(&tv1, NULL); + + av_init_packet(&pkt); /* Init static structure. */ ++#ifdef AVFMT_RAWPICTURE + if (ffmpeg->oc->oformat->flags & AVFMT_RAWPICTURE) { + pkt.stream_index = ffmpeg->video_st->index; + pkt.flags |= AV_PKT_FLAG_KEY; + pkt.data = (uint8_t *)pic; + pkt.size = sizeof(AVPicture); +- } else { ++ } else ++#endif ++ { + pkt.data = NULL; + pkt.size = 0; + retcd = avcodec_encode_video2(AVSTREAM_CODEC_PTR(ffmpeg->video_st),