Date: Tue, 24 Apr 2018 13:57:16 +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: r468207 - head/devel/renpy6/files Message-ID: <201804241357.w3ODvGTk031725@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Tue Apr 24 13:57:16 2018 New Revision: 468207 URL: https://svnweb.freebsd.org/changeset/ports/468207 Log: devel/renpy6: unbreak with ffmpeg 4.0 ffdecode.c:840:67: error: use of undeclared identifier 'CODEC_CAP_DELAY' if (!pkt_temp->data && dec->codec->capabilities & CODEC_CAP_DELAY) ^ ffdecode.c:1246:29: error: use of undeclared identifier 'CODEC_FLAG2_FAST' if(fast) enc->flags2 |= CODEC_FLAG2_FAST; ^ PR: 227726 Modified: head/devel/renpy6/files/patch-module_ffdecode.c (contents, props changed) Modified: head/devel/renpy6/files/patch-module_ffdecode.c ============================================================================== --- head/devel/renpy6/files/patch-module_ffdecode.c Tue Apr 24 13:57:04 2018 (r468206) +++ head/devel/renpy6/files/patch-module_ffdecode.c Tue Apr 24 13:57:16 2018 (r468207) @@ -71,6 +71,15 @@ https://github.com/renpy/renpy/commit/4aac7ca if (flush_complete) break; +@@ -836,7 +837,7 @@ static int audio_decode_frame(VideoState *is, double * + + if (!got_frame) { + /* stop sending empty packets if the decoder is finished */ +- if (!pkt_temp->data && dec->codec->capabilities & CODEC_CAP_DELAY) ++ if (!pkt_temp->data && dec->codec->capabilities & AV_CODEC_CAP_DELAY) + flush_complete = 1; + continue; + } @@ -1231,9 +1232,9 @@ static int stream_component_open(VideoSt /* prepare audio output */ if (enc->codec_type == AVMEDIA_TYPE_AUDIO) { @@ -83,6 +92,15 @@ https://github.com/renpy/renpy/commit/4aac7ca } } +@@ -1242,7 +1243,7 @@ static int stream_component_open(VideoState *is, int s + enc->debug = debug; + enc->workaround_bugs = workaround_bugs; + enc->idct_algo= idct; +- if(fast) enc->flags2 |= CODEC_FLAG2_FAST; ++ if(fast) enc->flags2 |= AV_CODEC_FLAG2_FAST; + enc->skip_frame= skip_frame; + enc->skip_idct= skip_idct; + enc->skip_loop_filter= skip_loop_filter; @@ -1633,7 +1634,7 @@ void ffpy_stream_close(VideoState *is) for(i=0; i<VIDEO_PICTURE_QUEUE_SIZE; i++) { vp = &is->pictq[i];
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804241357.w3ODvGTk031725>