[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31391] trunk/blender/intern/audaspace/ ffmpeg/AUD_FFMPEGReader.cpp: Audaspace: Fix for ppl with outdated ffmpeg.
Joerg Mueller
nexyon at gmail.com
Mon Aug 16 20:13:26 CEST 2010
Revision: 31391
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31391
Author: nexyon
Date: 2010-08-16 20:13:26 +0200 (Mon, 16 Aug 2010)
Log Message:
-----------
Audaspace: Fix for ppl with outdated ffmpeg.
Modified Paths:
--------------
trunk/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
Modified: trunk/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
===================================================================
--- trunk/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp 2010-08-16 17:57:39 UTC (rev 31390)
+++ trunk/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp 2010-08-16 18:13:26 UTC (rev 31391)
@@ -58,10 +58,15 @@
// read samples from the packet
data_size = buf_size - buf_pos;
- read_length = avcodec_decode_audio3(m_codecCtx,
+ /*read_length = avcodec_decode_audio3(m_codecCtx,
(int16_t*)(((data_t*)buffer.getBuffer())+buf_pos),
&data_size,
- packet);
+ packet);*/
+ read_length = avcodec_decode_audio2(m_codecCtx,
+ (int16_t*)(((data_t*)buffer.getBuffer()) + buf_pos),
+ &data_size,
+ audio_pkg_data,
+ audio_pkg_size);
// read error, next packet!
if(read_length < 0)
More information about the Bf-blender-cvs
mailing list