Changeset 11177

Show
Ignore:
Timestamp:
03/08/10 11:20:14 (3 years ago)
Author:
robert
Message:

Added extra ffmpeg version check

Location:
OpenSceneGraph/trunk/src/osgPlugins/ffmpeg
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp

    r11165 r11177  
    1717                         const uint8_t *buf, int buf_size) 
    1818{ 
    19 #if LIBAVCODEC_VERSION_MAJOR >= 52 
     19#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR==52 && LIBAVCODEC_VERSION_MINOR>=32) 
    2020 
    2121    // following code segment copied from ffmpeg's avcodec_decode_audio2() 

  • OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp

    r11165 r11177  
    1313                         const uint8_t *buf, int buf_size) 
    1414{ 
    15 #if LIBAVCODEC_VERSION_MAJOR >= 52 
     15#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR==52 && LIBAVCODEC_VERSION_MINOR>=32) 
    1616    // following code segment copied from ffmpeg avcodec_decode_video() implementation 
    1717    // to avoid warnings about deprecated function usage.