mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

FFMS2: Beta 7 release

Browse source 
Fix 3 gcc warnings

Originally committed to SVN as r2879.
This commit is contained in:
Fredrik Mellbin 2009-04-29 16:39:15 +00:00
parent 7f44500c89
commit 338188b184
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
aegisub/FFmpegSource2/ffaudiosource.cpp
View file

@ -150,7 +150,7 @@ Done:
} }
int FFAudioSource::GetAudio(void *Buf, int64_t Start, int64_t Count, char *ErrorMsg, unsigned MsgSize) { int FFAudioSource::GetAudio(void *Buf, int64_t Start, int64_t Count, char *ErrorMsg, unsigned MsgSize) {
const size_t SizeConst = (av_get_bits_per_sample_format(CodecContext->sample_fmt) * CodecContext->channels) / 8; const int64_t SizeConst = (av_get_bits_per_sample_format(CodecContext->sample_fmt) * CodecContext->channels) / 8;
size_t CurrentAudioBlock = FFMAX((int64_t)FindClosestAudioKeyFrame(Start) - 50, (int64_t)0); size_t CurrentAudioBlock = FFMAX((int64_t)FindClosestAudioKeyFrame(Start) - 50, (int64_t)0);
memset(Buf, 0, SizeConst * Count); memset(Buf, 0, SizeConst * Count);
AVPacket Packet; AVPacket Packet;
@ -306,7 +306,7 @@ MatroskaAudioSource::~MatroskaAudioSource() {
} }
int MatroskaAudioSource::GetAudio(void *Buf, int64_t Start, int64_t Count, char *ErrorMsg, unsigned MsgSize) { int MatroskaAudioSource::GetAudio(void *Buf, int64_t Start, int64_t Count, char *ErrorMsg, unsigned MsgSize) {
const size_t SizeConst = (av_get_bits_per_sample_format(CodecContext->sample_fmt) * CodecContext->channels) / 8; const int64_t SizeConst = (av_get_bits_per_sample_format(CodecContext->sample_fmt) * CodecContext->channels) / 8;
size_t CurrentAudioBlock = FFMAX((int64_t)FindClosestAudioKeyFrame(Start) - 10, (int64_t)0); size_t CurrentAudioBlock = FFMAX((int64_t)FindClosestAudioKeyFrame(Start) - 10, (int64_t)0);
avcodec_flush_buffers(CodecContext); avcodec_flush_buffers(CodecContext);

2
aegisub/FFmpegSource2/ffms2.html
View file

@ -242,7 +242,7 @@ Note that --enable-w32threads is required for multithreaded decoding to work.
<li>Fixed the accessing of codecprivate data with Haali's splitters</li> <li>Fixed the accessing of codecprivate data with Haali's splitters</li>
<li>Timecode output should be fixed to include decimals AND not be in scientific format</li> <li>Timecode output should be fixed to include decimals AND not be in scientific format</li>
<li>Fixed a memory leak when using Haali's splitters</li> <li>Fixed a memory leak when using Haali's splitters</li>
<li>Updated FFmpeg to rev X</li> <li>Updated FFmpeg to rev 18717</li>
</ul></li> </ul></li>
<li>2.00 beta 6<ul> <li>2.00 beta 6<ul>