Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Mueller <nexyon@gmail.com>2010-08-16 22:13:26 +0400
committerJoerg Mueller <nexyon@gmail.com>2010-08-16 22:13:26 +0400
commitdb38a7f2cc696fb57d579c63b3350e6114cd3087 (patch)
tree3bb72512e01d0b66a535440533765d548884ca8c /intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
parent5ab7047f65a1a2efb381c96e9167ee6a82ea31ba (diff)
Audaspace: Fix for ppl with outdated ffmpeg.
Diffstat (limited to 'intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp')
-rw-r--r--intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
index b9d5d304368..623e99d5edc 100644
--- a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
+++ b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
@@ -58,10 +58,15 @@ int AUD_FFMPEGReader::decode(AVPacket* packet, AUD_Buffer& buffer)
// 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)