diff --git a/src/FFmpeg.h b/src/FFmpeg.h index bc7925071..1077fb381 100644 --- a/src/FFmpeg.h +++ b/src/FFmpeg.h @@ -41,80 +41,82 @@ extern "C" { #include #include - #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55, 45, 101) - #define av_frame_alloc avcodec_alloc_frame - #define av_frame_free avcodec_free_frame - #endif + #if defined(DISABLE_DYNAMIC_LOADING_FFMPEG) + #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55, 45, 101) + #define av_frame_alloc avcodec_alloc_frame + #define av_frame_free avcodec_free_frame + #endif - #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 59, 100) - #define avcodec_free_frame av_free - #endif + #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 59, 100) + #define avcodec_free_frame av_free + #endif - #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 51, 100) - #define AVCodecID CodecID - #define AV_CODEC_ID_AAC CODEC_ID_AAC - #define AV_CODEC_ID_AC CODEC_ID_AC - #define AV_CODEC_ID_AC3 CODEC_ID_AC3 - #define AV_CODEC_ID_ADPCM CODEC_ID_ADPCM - #define AV_CODEC_ID_ADPCM_CT CODEC_ID_ADPCM_CT - #define AV_CODEC_ID_ADPCM_G726 CODEC_ID_ADPCM_G726 - #define AV_CODEC_ID_ADPCM_IMA_QT CODEC_ID_ADPCM_IMA_QT - #define AV_CODEC_ID_ADPCM_IMA_WAV CODEC_ID_ADPCM_IMA_WAV - #define AV_CODEC_ID_ADPCM_MS CODEC_ID_ADPCM_MS - #define AV_CODEC_ID_ADPCM_SWF CODEC_ID_ADPCM_SWF - #define AV_CODEC_ID_ADPCM_YAMAHA CODEC_ID_ADPCM_YAMAHA - #define AV_CODEC_ID_ALAC CODEC_ID_ALAC - #define AV_CODEC_ID_AMR CODEC_ID_AMR - #define AV_CODEC_ID_AMR_NB CODEC_ID_AMR_NB - #define AV_CODEC_ID_AMR_WB CODEC_ID_AMR_WB - #define AV_CODEC_ID_ATRAC CODEC_ID_ATRAC - #define AV_CODEC_ID_ATRAC3 CODEC_ID_ATRAC3 - #define AV_CODEC_ID_DTS CODEC_ID_DTS - #define AV_CODEC_ID_DVAUDIO CODEC_ID_DVAUDIO - #define AV_CODEC_ID_FLAC CODEC_ID_FLAC - #define AV_CODEC_ID_GSM CODEC_ID_GSM - #define AV_CODEC_ID_GSM_MS CODEC_ID_GSM_MS - #define AV_CODEC_ID_IMC CODEC_ID_IMC - #define AV_CODEC_ID_MACE CODEC_ID_MACE - #define AV_CODEC_ID_MACE3 CODEC_ID_MACE3 - #define AV_CODEC_ID_MACE6 CODEC_ID_MACE6 - #define AV_CODEC_ID_MP CODEC_ID_MP - #define AV_CODEC_ID_MP2 CODEC_ID_MP2 - #define AV_CODEC_ID_MP3 CODEC_ID_MP3 - #define AV_CODEC_ID_NELLYMOSER CODEC_ID_NELLYMOSER - #define AV_CODEC_ID_NONE CODEC_ID_NONE - #define AV_CODEC_ID_PCM CODEC_ID_PCM - #define AV_CODEC_ID_PCM_ALAW CODEC_ID_PCM_ALAW - #define AV_CODEC_ID_PCM_MULAW CODEC_ID_PCM_MULAW - #define AV_CODEC_ID_PCM_S16BE CODEC_ID_PCM_S16BE - #define AV_CODEC_ID_PCM_S16LE CODEC_ID_PCM_S16LE - #define AV_CODEC_ID_PCM_S24BE CODEC_ID_PCM_S24BE - #define AV_CODEC_ID_PCM_S24LE CODEC_ID_PCM_S24LE - #define AV_CODEC_ID_PCM_S32BE CODEC_ID_PCM_S32BE - #define AV_CODEC_ID_PCM_S32LE CODEC_ID_PCM_S32LE - #define AV_CODEC_ID_PCM_S8 CODEC_ID_PCM_S8 - #define AV_CODEC_ID_PCM_U8 CODEC_ID_PCM_U8 - #define AV_CODEC_ID_QCELP CODEC_ID_QCELP - #define AV_CODEC_ID_QDM CODEC_ID_QDM - #define AV_CODEC_ID_QDM2 CODEC_ID_QDM2 - #define AV_CODEC_ID_ROQ CODEC_ID_ROQ - #define AV_CODEC_ID_ROQ_DPCM CODEC_ID_ROQ_DPCM - #define AV_CODEC_ID_SONIC CODEC_ID_SONIC - #define AV_CODEC_ID_SONIC_LS CODEC_ID_SONIC_LS - #define AV_CODEC_ID_TRUESPEECH CODEC_ID_TRUESPEECH - #define AV_CODEC_ID_VORBIS CODEC_ID_VORBIS - #define AV_CODEC_ID_VOXWARE CODEC_ID_VOXWARE - #define AV_CODEC_ID_WMAPRO CODEC_ID_WMAPRO - #define AV_CODEC_ID_WMAV CODEC_ID_WMAV - #define AV_CODEC_ID_WMAV1 CODEC_ID_WMAV1 - #define AV_CODEC_ID_WMAV2 CODEC_ID_WMAV2 - #define AV_CODEC_ID_WMAVOICE CODEC_ID_WMAVOICE - #endif + #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 51, 100) + #define AVCodecID CodecID + #define AV_CODEC_ID_AAC CODEC_ID_AAC + #define AV_CODEC_ID_AC CODEC_ID_AC + #define AV_CODEC_ID_AC3 CODEC_ID_AC3 + #define AV_CODEC_ID_ADPCM CODEC_ID_ADPCM + #define AV_CODEC_ID_ADPCM_CT CODEC_ID_ADPCM_CT + #define AV_CODEC_ID_ADPCM_G726 CODEC_ID_ADPCM_G726 + #define AV_CODEC_ID_ADPCM_IMA_QT CODEC_ID_ADPCM_IMA_QT + #define AV_CODEC_ID_ADPCM_IMA_WAV CODEC_ID_ADPCM_IMA_WAV + #define AV_CODEC_ID_ADPCM_MS CODEC_ID_ADPCM_MS + #define AV_CODEC_ID_ADPCM_SWF CODEC_ID_ADPCM_SWF + #define AV_CODEC_ID_ADPCM_YAMAHA CODEC_ID_ADPCM_YAMAHA + #define AV_CODEC_ID_ALAC CODEC_ID_ALAC + #define AV_CODEC_ID_AMR CODEC_ID_AMR + #define AV_CODEC_ID_AMR_NB CODEC_ID_AMR_NB + #define AV_CODEC_ID_AMR_WB CODEC_ID_AMR_WB + #define AV_CODEC_ID_ATRAC CODEC_ID_ATRAC + #define AV_CODEC_ID_ATRAC3 CODEC_ID_ATRAC3 + #define AV_CODEC_ID_DTS CODEC_ID_DTS + #define AV_CODEC_ID_DVAUDIO CODEC_ID_DVAUDIO + #define AV_CODEC_ID_FLAC CODEC_ID_FLAC + #define AV_CODEC_ID_GSM CODEC_ID_GSM + #define AV_CODEC_ID_GSM_MS CODEC_ID_GSM_MS + #define AV_CODEC_ID_IMC CODEC_ID_IMC + #define AV_CODEC_ID_MACE CODEC_ID_MACE + #define AV_CODEC_ID_MACE3 CODEC_ID_MACE3 + #define AV_CODEC_ID_MACE6 CODEC_ID_MACE6 + #define AV_CODEC_ID_MP CODEC_ID_MP + #define AV_CODEC_ID_MP2 CODEC_ID_MP2 + #define AV_CODEC_ID_MP3 CODEC_ID_MP3 + #define AV_CODEC_ID_NELLYMOSER CODEC_ID_NELLYMOSER + #define AV_CODEC_ID_NONE CODEC_ID_NONE + #define AV_CODEC_ID_PCM CODEC_ID_PCM + #define AV_CODEC_ID_PCM_ALAW CODEC_ID_PCM_ALAW + #define AV_CODEC_ID_PCM_MULAW CODEC_ID_PCM_MULAW + #define AV_CODEC_ID_PCM_S16BE CODEC_ID_PCM_S16BE + #define AV_CODEC_ID_PCM_S16LE CODEC_ID_PCM_S16LE + #define AV_CODEC_ID_PCM_S24BE CODEC_ID_PCM_S24BE + #define AV_CODEC_ID_PCM_S24LE CODEC_ID_PCM_S24LE + #define AV_CODEC_ID_PCM_S32BE CODEC_ID_PCM_S32BE + #define AV_CODEC_ID_PCM_S32LE CODEC_ID_PCM_S32LE + #define AV_CODEC_ID_PCM_S8 CODEC_ID_PCM_S8 + #define AV_CODEC_ID_PCM_U8 CODEC_ID_PCM_U8 + #define AV_CODEC_ID_QCELP CODEC_ID_QCELP + #define AV_CODEC_ID_QDM CODEC_ID_QDM + #define AV_CODEC_ID_QDM2 CODEC_ID_QDM2 + #define AV_CODEC_ID_ROQ CODEC_ID_ROQ + #define AV_CODEC_ID_ROQ_DPCM CODEC_ID_ROQ_DPCM + #define AV_CODEC_ID_SONIC CODEC_ID_SONIC + #define AV_CODEC_ID_SONIC_LS CODEC_ID_SONIC_LS + #define AV_CODEC_ID_TRUESPEECH CODEC_ID_TRUESPEECH + #define AV_CODEC_ID_VORBIS CODEC_ID_VORBIS + #define AV_CODEC_ID_VOXWARE CODEC_ID_VOXWARE + #define AV_CODEC_ID_WMAPRO CODEC_ID_WMAPRO + #define AV_CODEC_ID_WMAV CODEC_ID_WMAV + #define AV_CODEC_ID_WMAV1 CODEC_ID_WMAV1 + #define AV_CODEC_ID_WMAV2 CODEC_ID_WMAV2 + #define AV_CODEC_ID_WMAVOICE CODEC_ID_WMAVOICE + #endif - #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 8, 100) - inline bool av_codec_is_encoder(AVCodec *codec) { - return codec != NULL && (codec->encode != NULL || codec->encode2 != NULL); - } + #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 8, 100) + inline bool av_codec_is_encoder(AVCodec *codec) { + return codec != NULL && (codec->encode != NULL || codec->encode2 != NULL); + } + #endif #endif } #endif