svn commit: r425290 - in head/comms/dabstick-radio: . files
Jan Beich
jbeich at FreeBSD.org
Fri Nov 4 07:05:52 UTC 2016
Author: jbeich
Date: Fri Nov 4 07:05:51 2016
New Revision: 425290
URL: https://svnweb.freebsd.org/changeset/ports/425290
Log:
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
Added:
head/comms/dabstick-radio/files/patch-dabreceiver-V2_backend_mp2processor-ffmpeg.cpp (contents, props changed)
Modified:
head/comms/dabstick-radio/Makefile (contents, props changed)
Modified: head/comms/dabstick-radio/Makefile
==============================================================================
--- head/comms/dabstick-radio/Makefile Fri Nov 4 05:54:20 2016 (r425289)
+++ head/comms/dabstick-radio/Makefile Fri Nov 4 07:05:51 2016 (r425290)
@@ -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/
Added: head/comms/dabstick-radio/files/patch-dabreceiver-V2_backend_mp2processor-ffmpeg.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/comms/dabstick-radio/files/patch-dabreceiver-V2_backend_mp2processor-ffmpeg.cpp Fri Nov 4 07:05:51 2016 (r425290)
@@ -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;
More information about the svn-ports-head
mailing list