Ticket #40024: patch-src-io-cxx-VideoUtilities.diff

File patch-src-io-cxx-VideoUtilities.diff, 796 bytes (added by andre.dos.anjos@…, 11 years ago)
  • src/io/cxx/VideoUtilities.cc

    diff --git src/io/cxx/VideoUtilities.cc src/io/cxx/VideoUtilities.cc
    index 2b8e9c1..d78cc67 100644
    extern "C" { 
    4141/**
    4242 * Some code to account for older versions of ffmpeg
    4343 */
    44 #ifndef AV_CODEC_ID_NONE
    45 #define AV_CODEC_ID_NONE CODEC_ID_NONE
    46 #define AV_CODEC_ID_MPEG1VIDEO CODEC_ID_MPEG1VIDEO
    47 #define AV_CODEC_ID_MPEG2VIDEO CODEC_ID_MPEG2VIDEO
    48 #define AV_CODEC_ID_MJPEG CODEC_ID_MJPEG
    49 typedef CodecID AVCodecID;
     44#if LIBAVCODEC_VERSION_INT < 0x363b64 //54.59.100 @ ffmpeg-1.0
     45#  define AV_CODEC_ID_NONE CODEC_ID_NONE
     46#  define AV_CODEC_ID_MPEG1VIDEO CODEC_ID_MPEG1VIDEO
     47#  define AV_CODEC_ID_MPEG2VIDEO CODEC_ID_MPEG2VIDEO
     48#  define AV_CODEC_ID_MJPEG CODEC_ID_MJPEG
    5049#endif
    5150
    5251#ifndef AV_PKT_FLAG_KEY