aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/ffmpeg
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2009-12-06 18:09:36 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2009-12-06 18:09:36 +0000
commit8a7a65fe04ced78f916cab6946b579580e6b0d6f (patch)
treea4179f29683101279d19fe50c8c04c777e8cdcfe /src/lib/ffmpeg
parentb53bf8320e97d53ecb6169ec2737676fb32e7ece (diff)
downloadusdx-8a7a65fe04ced78f916cab6946b579580e6b0d6f.tar.gz
usdx-8a7a65fe04ced78f916cab6946b579580e6b0d6f.tar.xz
usdx-8a7a65fe04ced78f916cab6946b579580e6b0d6f.zip
update to version 52.38.1
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1983 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r--src/lib/ffmpeg/avcodec.pas12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/lib/ffmpeg/avcodec.pas b/src/lib/ffmpeg/avcodec.pas
index 7d33efad..505a5b5e 100644
--- a/src/lib/ffmpeg/avcodec.pas
+++ b/src/lib/ffmpeg/avcodec.pas
@@ -31,7 +31,7 @@
*)
{
* update to
- * Max. version: 52.37.1, Sun Dec 6 18:58:00 2009 CET
+ * Max. version: 52.38.1, Sun Dec 6 18:05:00 2009 CET
* MiSchi
}
@@ -65,7 +65,7 @@ uses
const
(* Max. supported version by this header *)
LIBAVCODEC_MAX_VERSION_MAJOR = 52;
- LIBAVCODEC_MAX_VERSION_MINOR = 37;
+ LIBAVCODEC_MAX_VERSION_MINOR = 38;
LIBAVCODEC_MAX_VERSION_RELEASE = 1;
LIBAVCODEC_MAX_VERSION = (LIBAVCODEC_MAX_VERSION_MAJOR * VERSION_MAJOR) +
(LIBAVCODEC_MAX_VERSION_MINOR * VERSION_MINOR) +
@@ -480,7 +480,13 @@ const
CH_TOP_BACK_RIGHT = $00020000;
CH_STEREO_LEFT = $20000000; ///< Stereo downmix.
CH_STEREO_RIGHT = $40000000; ///< See CH_STEREO_LEFT.
-
+{** Channel mask value used for AVCodecContext.request_channel_layout
+ * to indicate that the user requests the channel order of the decoder output
+ * to be the native codec channel order.
+ *}
+{$IF LIBAVCODEC_VERSION >= 52038001} // >= 52.38.1
+ CH_LAYOUT_NATIVE = $8000000000000000LL
+{$IFEND}
{* Audio channel convenience macros *}
CH_LAYOUT_MONO = (CH_FRONT_CENTER);
CH_LAYOUT_STEREO = (CH_FRONT_LEFT or CH_FRONT_RIGHT);