TDE
/
k3b
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/k3b
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix build failures against ffmpeg >=0.11.

Browse Source 
Thanks to David C. Rankin.
(cherry picked from commit cc573f2493)
v3.5.13-sru
Darrell Anderson 13 years ago committed by Slávek Banko
parent c0c6d6299c
commit 09b5ec34cd
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File

16
plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
Unescape View File

@ -1,4 +1,4 @@
/* /*
* *
* $Id: k3bffmpegwrapper.cpp 641819 2007-03-12 17:29:23Z trueg $ * $Id: k3bffmpegwrapper.cpp 641819 2007-03-12 17:29:23Z trueg $
* Copyright (C) 2004-2007 Sebastian Trueg <trueg@k3b.org> * Copyright (C) 2004-2007 Sebastian Trueg <trueg@k3b.org>
@ -79,14 +79,14 @@ bool K3bFFMpegFile::open()
close(); close();
// open the file // open the file
int err = av_open_input_file( &d->formatContext, m_filename.local8Bit(), 0, 0, 0 ); int err = avformat_open_input( &d->formatContext, m_filename.local8Bit(), 0, 0);
if( err < 0 ) { if( err < 0 ) {
kdDebug() << "(K3bFFMpegFile) unable to open " << m_filename << " with error " << err << endl; kdDebug() << "(K3bFFMpegFile) unable to open " << m_filename << " with error " << err << endl;
return false; return false;
} }
// analyze the streams // analyze the streams
av_find_stream_info( d->formatContext ); avformat_find_stream_info( d->formatContext, NULL );
// we only handle files containing one audio stream // we only handle files containing one audio stream
if( d->formatContext->nb_streams != 1 ) { if( d->formatContext->nb_streams != 1 ) {
@ -114,7 +114,7 @@ bool K3bFFMpegFile::open()
// open the codec on our context // open the codec on our context
kdDebug() << "(K3bFFMpegFile) found codec for " << m_filename << endl; kdDebug() << "(K3bFFMpegFile) found codec for " << m_filename << endl;
if( avcodec_open( codecContext, d->codec ) < 0 ) { if( avcodec_open2( codecContext, d->codec, NULL ) < 0 ) {
kdDebug() << "(K3bFFMpegDecoderFactory) could not open codec." << endl; kdDebug() << "(K3bFFMpegDecoderFactory) could not open codec." << endl;
return false; return false;
} }
@ -128,7 +128,7 @@ bool K3bFFMpegFile::open()
} }
// dump some debugging info // dump some debugging info
dump_format( d->formatContext, 0, m_filename.local8Bit(), 0 ); av_dump_format( d->formatContext, 0, m_filename.local8Bit(), 0 );
return true; return true;
} }
@ -150,7 +150,7 @@ void K3bFFMpegFile::close()
} }
if( d->formatContext ) { if( d->formatContext ) {
av_close_input_file( d->formatContext ); avformat_close_input( &d->formatContext );
d->formatContext = 0; d->formatContext = 0;
} }
} }
@ -315,8 +315,8 @@ int K3bFFMpegFile::fillOutputBuffer()
av_init_packet( &avp ); av_init_packet( &avp );
avp.data = d->packetData; avp.data = d->packetData;
avp.size = d->packetSize; avp.size = d->packetSize;
int len = avcodec_decode_audio3( d->formatContext->streams[0]->codec, int len = avcodec_decode_audio4( d->formatContext->streams[0]->codec,
(short*)d->outputBuffer, &d->outputBufferSize, (AVFrame*)d->outputBuffer, &d->outputBufferSize,
&avp ); &avp );
#else #else
#ifdef FFMPEG_BUILD_PRE_4629 #ifdef FFMPEG_BUILD_PRE_4629

Write Preview
Loading…
Cancel
Save