cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

comms/dabstick-radio: unbreak build with ffmpeg 3.x

Browse Source 
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
This commit is contained in:
Jan Beich 2016-11-04 07:05:51 +00:00
parent f785e5c8e6
commit 9aa36d40ab
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=425290
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
comms/dabstick-radio/Makefile
View File

@ -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/

29
comms/dabstick-radio/files/patch-dabreceiver-V2_backend_mp2processor-ffmpeg.cpp Normal file
View File

@ -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;