diff options
| author | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2008-05-08 15:31:55 +0000 |
|---|---|---|
| committer | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2008-05-08 15:31:55 +0000 |
| commit | d9f655090a307ecc8bb3ea4a74572744090bb2d7 (patch) | |
| tree | c17f614531d4ddb228ac1c24a6b915868bb91298 /Game/Code/lib/ffmpeg/avcodec.pas | |
| parent | b549a7d266bf78d813c96d61b39934906b5176a1 (diff) | |
| download | usdx-d9f655090a307ecc8bb3ea4a74572744090bb2d7.tar.gz usdx-d9f655090a307ecc8bb3ea4a74572744090bb2d7.tar.xz usdx-d9f655090a307ecc8bb3ea4a74572744090bb2d7.zip | |
ffmpeg update
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1067 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
| -rw-r--r-- | Game/Code/lib/ffmpeg/avcodec.pas | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/Game/Code/lib/ffmpeg/avcodec.pas b/Game/Code/lib/ffmpeg/avcodec.pas index 3cd880c8..79bfa0b1 100644 --- a/Game/Code/lib/ffmpeg/avcodec.pas +++ b/Game/Code/lib/ffmpeg/avcodec.pas @@ -23,7 +23,7 @@ (* * Min. version: 51.16.0 - * Max. version: 51.54.0, revision 12796, Sun Apr 13 07:48:43 2008 UTC + * Max. version: 51.56.0, revision 13019, Tue Apr 29 14:08:01 2008 UTC *) unit avcodec; @@ -47,7 +47,7 @@ uses const (* Max. supported version by this header *) LIBAVCODEC_MAX_VERSION_MAJOR = 51; - LIBAVCODEC_MAX_VERSION_MINOR = 54; + LIBAVCODEC_MAX_VERSION_MINOR = 56; LIBAVCODEC_MAX_VERSION_RELEASE = 0; LIBAVCODEC_MAX_VERSION = (LIBAVCODEC_MAX_VERSION_MAJOR * VERSION_MAJOR) + (LIBAVCODEC_MAX_VERSION_MINOR * VERSION_MINOR) + @@ -202,6 +202,7 @@ type CODEC_ID_8SVX_FIB, CODEC_ID_ESCAPE124, CODEC_ID_DIRAC, + CODEC_ID_BFI, //* various PCM "codecs" */ CODEC_ID_PCM_S16LE= $10000, @@ -251,6 +252,7 @@ type CODEC_ID_ADPCM_IMA_EA_SEAD, CODEC_ID_ADPCM_IMA_EA_EACS, CODEC_ID_ADPCM_EA_XAS, + CODEC_ID_ADPCM_EA_MAXIS_XA, //* AMR */ CODEC_ID_AMR_NB= $12000, @@ -937,7 +939,7 @@ const FF_MB_DECISION_SIMPLE = 0; ///< uses mb_cmp FF_MB_DECISION_BITS = 1; ///< chooses the one which needs the fewest bits - FF_MB_DECISION_RD = 2; ///< rate distoration + FF_MB_DECISION_RD = 2; ///< rate distortion FF_AA_AUTO = 0; FF_AA_FASTINT = 1; //not implemented yet @@ -2316,8 +2318,14 @@ type * Will be called when seeking *) flush: procedure (avctx: PAVCodecContext); cdecl; - {const} supported_framerates: PAVRational; ///array of supported framerates, or NULL if any, array is terminated by {0,0} - {const} pix_fmts: PAVPixelFormat; ///array of supported pixel formats, or NULL if unknown, array is terminanted by -1 + {const} supported_framerates: PAVRational; ///< array of supported framerates, or NULL if any, array is terminated by {0,0} + {const} pix_fmts: PAVPixelFormat; ///< array of supported pixel formats, or NULL if unknown, array is terminated by -1 + {$IF LIBAVCODEC_VERSION >= 51055000} // 51.55.0 + {const} long_name: PChar; ///< descriptive name for the codec, meant to be more human readable than \p name + {$IFEND} + {$IF LIBAVCODEC_VERSION >= 51056000} // 51.56.0 + {const} supported_samplerates: PInteger; ///< array of supported audio samplerates, or NULL if unknown, array is terminated by 0 + {$IFEND} end; (** |