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

Stop using deprecated FFMPEG calls in the code.

Browse Source 
This allows the port to be built with the upcoming FFMPEG 3.x series while
still maintaining compatibility with FFMPEG 2.x that is currently in the ports
tree.

I don't think PORTREVISION needs to be bumped here, as both the old and new
calls exist in FFMPEG 2.x, and when FFMPEG 3 lands there will be a PORTREVISION
bump anyway.

PR:		214184
Submitted by:	Matthey Rezny <matthew@reztek.cz>
This commit is contained in:
Raphael Kubo da Costa 2016-12-05 17:48:57 +00:00
parent b7ae95dcdd
commit cc165688c9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=427911
1 changed files with 85 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
audio/amarok-kde4/files/patch-kde_rb-126682 Normal file
View File

@ -0,0 +1,85 @@
# Fix build with FFmpeg 3.x; obtained from https://git.reviewboard.kde.org/r/126682
#
--- src/musicbrainz/MusicDNSAudioDecoder.cpp
+++ src/musicbrainz/MusicDNSAudioDecoder.cpp
@@ -243,7 +243,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c
{
if( !decodedFrame )
{
- decodedFrame = avcodec_alloc_frame();
+ decodedFrame = av_frame_alloc();
if( !decodedFrame )
{
warning() << "Unable to allocate enough memory to decode file.";
@@ -251,7 +251,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c
break;
}
else
- avcodec_get_frame_defaults( decodedFrame );
+ av_frame_unref( decodedFrame );
}
decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt );
@@ -287,7 +287,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c
avcodec_close( pCodecCtx );
avformat_close_input( &pFormatCtx );
- av_free( decodedFrame );
+ av_frame_free( &decodedFrame );
return data->duration();
}
@@ -361,7 +361,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c
{
if( !decodedFrame )
{
- decodedFrame = avcodec_alloc_frame();
+ decodedFrame = av_frame_alloc();
if( !decodedFrame )
{
warning() << "Unable to allocate enough memory to decode file.";
@@ -369,7 +369,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c
break;
}
else
- avcodec_get_frame_defaults( decodedFrame );
+ av_frame_unref( decodedFrame );
}
decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt );
@@ -405,7 +405,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c
avcodec_close( pCodecCtx );
avformat_close_input( &pFormatCtx );
- av_free( decodedFrame );
+ av_frame_free( &decodedFrame );
return data->duration();
}
@@ -479,7 +479,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c
{
if( !decodedFrame )
{
- decodedFrame = avcodec_alloc_frame();
+ decodedFrame = av_frame_alloc();
if( !decodedFrame )
{
warning() << "Unable to allocate enough memory to decode file.";
@@ -487,7 +487,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c
break;
}
else
- avcodec_get_frame_defaults( decodedFrame );
+ av_frame_unref( decodedFrame );
}
decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt );
@@ -523,7 +523,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c
avcodec_close( pCodecCtx );
av_close_input_file( pFormatCtx );
- av_free( decodedFrame );
+ av_frame_free( &decodedFrame );
return data->duration();
}