Show
Ignore:
Timestamp:
01/23/15 18:15:20 (4 days ago)
Author:
robert
Message:

From Javier Taibo,
"I have found a "bug" in the new audio decoding code (actually I think the bug is in ffmpeg, but anyway it should be wise to protect the OSG plug-in about it). I am attaching a security check in FFmpegDecoderAudio.cpp.

If anybody is curious about the problem, it happens sometimes when decoding an AAC audio stream. It eventually includes a PCE block inside the AAC audio frame and then ffmpeg audio decoding function signals a "new_frame" with 1024 samples, but a null pointer instead of the audio data. It can be easily detected because in these cases number of channels is 0. Maybe this is the intended behaviour for ffmpeg, but I find it quite weird.
"

" It seems that libav does not have a channels attribute in AVFrame structure. This new version should do."

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/OpenThreads/CMakeLists.txt

    r12558 r13482  
    8282 
    8383# Add support for using Qt threads 
    84 IF(QT4_FOUND) 
     84IF(QT4_FOUND OR Qt5Widgets_FOUND) 
    8585    OPTION(BUILD_OPENTHREADS_WITH_QT "Build OpenThreads with Qt threading support." OFF) 
    8686ENDIF() 
     
    8989IF(ANDROID) 
    9090    SUBDIRS(pthreads) 
    91 ELSEIF(QT4_FOUND AND BUILD_OPENTHREADS_WITH_QT) 
     91ELSEIF((QT4_FOUND OR Qt5Widgets_FOUND) AND BUILD_OPENTHREADS_WITH_QT) 
    9292    SUBDIRS(qt) 
    9393ELSEIF(WIN32)