hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-27 23:34:06 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

FFmpeg: Fix potential crash on some codecs (speex for example)

Browse source
This commit is contained in:
Timon Wong 2013-05-24 16:15:07 +08:00
parent f4734c076c
commit 525a539b7e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ffmpegaudio.cc
View file

@ -351,7 +351,7 @@ bool DecoderContext::play( QString & errorString )
av_free_packet( &packet );
}
if ( codecContext_->codec->capabilities & CODEC_CAP_DELAY )
if ( !isCancelled_ && codecContext_->codec->capabilities & CODEC_CAP_DELAY )
{
av_init_packet( &packet );
int gotFrame = 0;
@ -396,7 +396,7 @@ bool DecoderContext::normalizeAudio( AVFrame * frame, vector<char> & samples )
case AV_SAMPLE_FMT_S32:
{
samples.resize( dataSize );
memcpy( &samples.front(), frame->extended_data[0], lineSize );
memcpy( &samples.front(), frame->data[0], lineSize );
}
break;
case AV_SAMPLE_FMT_FLT:
@ -406,7 +406,7 @@ bool DecoderContext::normalizeAudio( AVFrame * frame, vector<char> & samples )
int32_t * out = ( int32_t * )&samples.front();
for ( int i = 0; i < dataSize; i += sizeof( float ) )
{
*out++ = toInt32( *( float * )frame->extended_data[i] );
*out++ = toInt32( *( float * )frame->data[i] );
}
}
break;
@ -417,7 +417,7 @@ bool DecoderContext::normalizeAudio( AVFrame * frame, vector<char> & samples )
int32_t * out = ( int32_t * )&samples.front();
for ( int i = 0; i < dataSize; i += sizeof( double ) )
{
*out++ = toInt32( *( double * )frame->extended_data[i] );
*out++ = toInt32( *( double * )frame->data[i] );
}
}
break;