diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/ffmpeg-2.2/avcodec.pas | 1 | ||||
| -rw-r--r-- | src/lib/ffmpeg-2.2/avformat.pas | 1 | ||||
| -rw-r--r-- | src/lib/ffmpeg-2.2/avutil.pas | 2 | ||||
| -rw-r--r-- | src/lib/ffmpeg-2.2/ff_api-defines.inc | 204 | ||||
| -rw-r--r-- | src/lib/ffmpeg-2.2/swscale.pas | 1 |
5 files changed, 209 insertions, 0 deletions
diff --git a/src/lib/ffmpeg-2.2/avcodec.pas b/src/lib/ffmpeg-2.2/avcodec.pas index 700eee12..66a3b551 100644 --- a/src/lib/ffmpeg-2.2/avcodec.pas +++ b/src/lib/ffmpeg-2.2/avcodec.pas @@ -37,6 +37,7 @@ unit avcodec; {$ENDIF} {$I switches.inc} (* for ffmpeg defines *) +{$I ff_api-defines.inc} (* FF_API_* defines *) {$IFDEF DARWIN} {$linklib libavcodec} diff --git a/src/lib/ffmpeg-2.2/avformat.pas b/src/lib/ffmpeg-2.2/avformat.pas index a53e913e..e40ebea6 100644 --- a/src/lib/ffmpeg-2.2/avformat.pas +++ b/src/lib/ffmpeg-2.2/avformat.pas @@ -36,6 +36,7 @@ unit avformat; {$ENDIF} {$I switches.inc} (* for the HasInline define *) +{$I ff_api-defines.inc} (* FF_API_* defines *) {$IFDEF DARWIN} {$linklib libavformat} diff --git a/src/lib/ffmpeg-2.2/avutil.pas b/src/lib/ffmpeg-2.2/avutil.pas index 33511b60..959a11e4 100644 --- a/src/lib/ffmpeg-2.2/avutil.pas +++ b/src/lib/ffmpeg-2.2/avutil.pas @@ -39,6 +39,8 @@ unit avutil; {$MINENUMSIZE 4} (* use 4-byte enums *) {$ENDIF} +{$I ff_api-defines.inc} (* FF_API_* defines *) + {$IFDEF DARWIN} {$linklib libavutil} {$ENDIF} diff --git a/src/lib/ffmpeg-2.2/ff_api-defines.inc b/src/lib/ffmpeg-2.2/ff_api-defines.inc new file mode 100644 index 00000000..72a7f4c6 --- /dev/null +++ b/src/lib/ffmpeg-2.2/ff_api-defines.inc @@ -0,0 +1,204 @@ +// prevent pasdoc from parsing this file +{$IFNDEF PASDOC} + +(** + * FF_API_* defines may be placed below to indicate public API that will be + * dropped at a future version bump. The defines themselves are not part of + * the public API and may change, break or disappear at any time. + *) + +(** avcodec defines *) +{$ifndef FF_API_REQUEST_CHANNELS} +{$define FF_API_REQUEST_CHANNELS := (LIBAVCODEC_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_OLD_DECODE_AUDIO} +{$define FF_API_OLD_DECODE_AUDIO := (LIBAVCODEC_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_OLD_ENCODE_AUDIO} +{$define FF_API_OLD_ENCODE_AUDIO := (LIBAVCODEC_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_OLD_ENCODE_VIDEO} +{$define FF_API_OLD_ENCODE_VIDEO := (LIBAVCODEC_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_CODEC_ID} +{$define FF_API_CODEC_ID := (LIBAVCODEC_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_AUDIO_CONVERT} +{$define FF_API_AUDIO_CONVERT := (LIBAVCODEC_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_AVCODEC_RESAMPLE} +{$define FF_API_AVCODEC_RESAMPLE := (LIBAVCODEC_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_DEINTERLACE} +{$define FF_API_DEINTERLACE := (LIBAVCODEC_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_DESTRUCT_PACKET} +{$define FF_API_DESTRUCT_PACKET := (LIBAVCODEC_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_GET_BUFFER} +{$define FF_API_GET_BUFFER := (LIBAVCODEC_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_MISSING_SAMPLE} +{$define FF_API_MISSING_SAMPLE := (LIBAVCODEC_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_LOWRES} +{$define FF_API_LOWRES := (LIBAVCODEC_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_CAP_VDPAU} +{$define FF_API_CAP_VDPAU := (LIBAVCODEC_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_BUFS_VDPAU} +{$define FF_API_BUFS_VDPAU := (LIBAVCODEC_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_VOXWARE} +{$define FF_API_VOXWARE := (LIBAVCODEC_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_SET_DIMENSIONS} +{$define FF_API_SET_DIMENSIONS := (LIBAVCODEC_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_DEBUG_MV} +{$define FF_API_DEBUG_MV := (LIBAVCODEC_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_AC_VLC} +{$define FF_API_AC_VLC := (LIBAVCODEC_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_OLD_MSMPEG4} +{$define FF_API_OLD_MSMPEG4 := (LIBAVCODEC_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_ASPECT_EXTENDED} +{$define FF_API_ASPECT_EXTENDED := (LIBAVCODEC_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_THREAD_OPAQUE} +{$define FF_API_THREAD_OPAQUE := (LIBAVCODEC_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_CODEC_PKT} +{$define FF_API_CODEC_PKT := (LIBAVCODEC_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_ARCH_ALPHA} +{$define FF_API_ARCH_ALPHA := (LIBAVCODEC_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_XVMC} +{$define FF_API_XVMC := (LIBAVCODEC_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_ERROR_RATE} +{$define FF_API_ERROR_RATE := (LIBAVCODEC_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_QSCALE_TYPE} +{$define FF_API_QSCALE_TYPE := (LIBAVCODEC_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_MB_TYPE} +{$define FF_API_MB_TYPE := (LIBAVCODEC_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_MAX_BFRAMES} +{$define FF_API_MAX_BFRAMES := (LIBAVCODEC_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_FAST_MALLOC} +{$define FF_API_FAST_MALLOC := (LIBAVCODEC_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_NEG_LINESIZES} +{$define FF_API_NEG_LINESIZES := (LIBAVCODEC_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_EMU_EDGE} +{$define FF_API_EMU_EDGE := (LIBAVCODEC_VERSION_MAJOR < 56)} +{$endif} + +(* avutil defines *) +{$ifndef FF_API_GET_BITS_PER_SAMPLE_FMT} +{$define FF_API_GET_BITS_PER_SAMPLE_FMT := (LIBAVUTIL_VERSION_MAJOR < 54)} +{$endif} +{$ifndef FF_API_FIND_OPT} +{$define FF_API_FIND_OPT := (LIBAVUTIL_VERSION_MAJOR < 54)} +{$endif} +{$ifndef FF_API_OLD_AVOPTIONS} +{$define FF_API_OLD_AVOPTIONS := (LIBAVUTIL_VERSION_MAJOR < 54)} +{$endif} +{$ifndef FF_API_PIX_FMT} +{$define FF_API_PIX_FMT := (LIBAVUTIL_VERSION_MAJOR < 54)} +{$endif} +{$ifndef FF_API_CONTEXT_SIZE} +{$define FF_API_CONTEXT_SIZE := (LIBAVUTIL_VERSION_MAJOR < 54)} +{$endif} +{$ifndef FF_API_PIX_FMT_DESC} +{$define FF_API_PIX_FMT_DESC := (LIBAVUTIL_VERSION_MAJOR < 54)} +{$endif} +{$ifndef FF_API_AV_REVERSE} +{$define FF_API_AV_REVERSE := (LIBAVUTIL_VERSION_MAJOR < 54)} +{$endif} +{$ifndef FF_API_AUDIOCONVERT} +{$define FF_API_AUDIOCONVERT := (LIBAVUTIL_VERSION_MAJOR < 54)} +{$endif} +{$ifndef FF_API_CPU_FLAG_MMX2} +{$define FF_API_CPU_FLAG_MMX2 := (LIBAVUTIL_VERSION_MAJOR < 54)} +{$endif} +{$ifndef FF_API_SAMPLES_UTILS_RETURN_ZERO} +{$define FF_API_SAMPLES_UTILS_RETURN_ZERO := (LIBAVUTIL_VERSION_MAJOR < 54)} +{$endif} +{$ifndef FF_API_LLS_PRIVATE} +{$define FF_API_LLS_PRIVATE := (LIBAVUTIL_VERSION_MAJOR < 54)} +{$endif} +{$ifndef FF_API_LLS1} +{$define FF_API_LLS1 :=(LIBAVUTIL_VERSION_MAJOR < 54)} +{$endif} +{$ifndef FF_API_AVFRAME_LAVC} +{$define FF_API_AVFRAME_LAVC := (LIBAVUTIL_VERSION_MAJOR < 54)} +{$endif} +{$ifndef FF_API_VDPAU} +{$define FF_API_VDPAU := (LIBAVUTIL_VERSION_MAJOR < 54)} +{$endif} +{$ifndef FF_API_GET_CHANNEL_LAYOUT_COMPAT} +{$define FF_API_GET_CHANNEL_LAYOUT_COMPAT := (LIBAVUTIL_VERSION_MAJOR < 54)} +{$endif} +{$ifndef FF_API_OLD_OPENCL} +{$define FF_API_OLD_OPENCL := (LIBAVUTIL_VERSION_MAJOR < 54)} +{$endif} +{$ifndef FF_API_XVMC} +{$define FF_API_XVMC := (LIBAVUTIL_VERSION_MAJOR < 54)} +{$endif} +{$ifndef FF_API_INTFLOAT +{$define FF_API_INTFLOAT := (LIBAVUTIL_VERSION_MAJOR < 54)} +{$endif} +{$ifndef FF_API_OPT_TYPE_METADATA} +{$define FF_API_OPT_TYPE_METADATA := (LIBAVUTIL_VERSION_MAJOR < 54)} +{$endif} + +(** avformat FF_API defines *) +{$ifndef FF_API_REFERENCE_DTS} +{$define FF_API_REFERENCE_DTS := (LIBAVFORMAT_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_ALLOC_OUTPUT_CONTEXT} +{$define FF_API_ALLOC_OUTPUT_CONTEXT := (LIBAVFORMAT_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_FORMAT_PARAMETERS} +{$define FF_API_FORMAT_PARAMETERS := (LIBAVFORMAT_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_NEW_STREAM} +{$define FF_API_NEW_STREAM := (LIBAVFORMAT_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_SET_PTS_INFO} +{$define FF_API_SET_PTS_INFO := (LIBAVFORMAT_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_CLOSE_INPUT_FILE} +{$define FF_API_CLOSE_INPUT_FILE := (LIBAVFORMAT_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_READ_PACKET} +{$define FF_API_READ_PACKET := (LIBAVFORMAT_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_ASS_SSA} +{$define FF_API_ASS_SSA := (LIBAVFORMAT_VERSION_MAJOR < 56)} +{$endif} +{$ifndef FF_API_R_FRAME_RATE} +{$define FF_API_R_FRAME_RATE := 1} +{$endif} + +(** swscale FF_API defines *) +{$ifndef FF_API_SWS_GETCONTEXT} +{$define FF_API_SWS_GETCONTEXT := (LIBSWSCALE_VERSION_MAJOR < 3)} +{$endif} +{$ifndef FF_API_SWS_CPU_CAPS} +{$define FF_API_SWS_CPU_CAPS := (LIBSWSCALE_VERSION_MAJOR < 3)} +{$endif} +{$ifndef FF_API_SWS_FORMAT_NAME} +{$define FF_API_SWS_FORMAT_NAME := (LIBSWSCALE_VERSION_MAJOR < 3)} +{$endif} + +{$ENDIF PASDOC}
\ No newline at end of file diff --git a/src/lib/ffmpeg-2.2/swscale.pas b/src/lib/ffmpeg-2.2/swscale.pas index b22fc4db..4b9dff2f 100644 --- a/src/lib/ffmpeg-2.2/swscale.pas +++ b/src/lib/ffmpeg-2.2/swscale.pas @@ -34,6 +34,7 @@ unit swscale; {$ENDIF} {$I switches.inc} (* for ffmpeg defines *) +{$I ff_api-defines.inc} (* FF_API_* defines *) {$IFDEF DARWIN} {$linklib libswscale} |