Date: Fri, 4 Nov 2016 07:08:39 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425291 - in branches/2016Q4/comms/dabstick-radio: . files Message-ID: <201611040708.uA478d87094045@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Fri Nov 4 07:08:39 2016 New Revision: 425291 URL: https://svnweb.freebsd.org/changeset/ports/425291 Log: MFH: r425290 comms/dabstick-radio: unbreak build with ffmpeg 3.x backend/mp2processor-ffmpeg.cpp:49:33: error: use of undeclared identifier 'CODEC_ID_MP1'; did you mean 'AV_CODEC_ID_MP1'? codec = avcodec_find_decoder (CODEC_ID_MP1); ^~~~~~~~~~~~ In file included from backend/mp2processor.cpp:7: backend/mp2processor-ffmpeg.cpp:66:18: error: use of undeclared identifier 'avcodec_alloc_frame' decoded_frame = avcodec_alloc_frame (); ^ backend/mp2processor-ffmpeg.cpp:107:2: error: use of undeclared identifier 'avcodec_get_frame_defaults' avcodec_get_frame_defaults (decoded_frame); ^ PR: 207547 Approved by: ports-secteam blanket Added: branches/2016Q4/comms/dabstick-radio/files/patch-dabreceiver-V2_backend_mp2processor-ffmpeg.cpp - copied unchanged from r425290, head/comms/dabstick-radio/files/patch-dabreceiver-V2_backend_mp2processor-ffmpeg.cpp Modified: branches/2016Q4/comms/dabstick-radio/Makefile Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/comms/dabstick-radio/Makefile ============================================================================== --- branches/2016Q4/comms/dabstick-radio/Makefile Fri Nov 4 07:05:51 2016 (r425290) +++ branches/2016Q4/comms/dabstick-radio/Makefile Fri Nov 4 07:08:39 2016 (r425291) @@ -3,7 +3,7 @@ PORTNAME= dabstick-radio PORTVERSION= 0.96 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= comms audio hamradio MASTER_SITES= http://www.sdr-j.tk/ \ LOCAL/nox/ Copied: branches/2016Q4/comms/dabstick-radio/files/patch-dabreceiver-V2_backend_mp2processor-ffmpeg.cpp (from r425290, head/comms/dabstick-radio/files/patch-dabreceiver-V2_backend_mp2processor-ffmpeg.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/comms/dabstick-radio/files/patch-dabreceiver-V2_backend_mp2processor-ffmpeg.cpp Fri Nov 4 07:08:39 2016 (r425291, copy of r425290, head/comms/dabstick-radio/files/patch-dabreceiver-V2_backend_mp2processor-ffmpeg.cpp) @@ -0,0 +1,29 @@ +--- dabreceiver-V2/backend/mp2processor-ffmpeg.cpp.orig 2013-05-20 16:11:57 UTC ++++ dabreceiver-V2/backend/mp2processor-ffmpeg.cpp +@@ -46,7 +46,7 @@ int32_t mp2sampleRate (uint8_t *frame) { + + avcodec_register_all (); + av_init_packet (&avpkt); +- codec = avcodec_find_decoder (CODEC_ID_MP1); ++ codec = avcodec_find_decoder (AV_CODEC_ID_MP1); + if (codec == NULL) { + fprintf (stderr, "Codec not found\n"); + return; +@@ -63,7 +63,7 @@ int32_t mp2sampleRate (uint8_t *frame) { + return; + } + +- decoded_frame = avcodec_alloc_frame (); ++ decoded_frame = av_frame_alloc (); + if (decoded_frame == NULL) { + fprintf (stderr, "Could not allocate audioframe\n"); + return; +@@ -104,7 +104,7 @@ int32_t got_frame; + (void)fwrite (MP2frame, sizeof (uint8_t), MP2framebytes, mp2File); + return; + } +- avcodec_get_frame_defaults (decoded_frame); ++ av_frame_unref (decoded_frame); + + avpkt. data = MP2frame; + avpkt. size = MP2framebytes + 20;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611040708.uA478d87094045>