aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2013-05-17 22:04:14 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2013-05-17 22:04:14 +0000
commitcc0b72e5e5e1c620b654ecf14d89ac9c4706e4e6 (patch)
treee3e215a2cb816e1da554278b07e2a61dc1edcac0 /src
parentc4bbc87f2f277dabe2bb98b7db1b4bc2a2bf13b6 (diff)
downloadusdx-cc0b72e5e5e1c620b654ecf14d89ac9c4706e4e6.tar.gz
usdx-cc0b72e5e5e1c620b654ecf14d89ac9c4706e4e6.tar.xz
usdx-cc0b72e5e5e1c620b654ecf14d89ac9c4706e4e6.zip
always enalbe FF_API_OLD_DECODE_AUDIO in avcodec.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2996 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src')
-rw-r--r--src/lib/ffmpeg-0.9/avcodec.pas10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/lib/ffmpeg-0.9/avcodec.pas b/src/lib/ffmpeg-0.9/avcodec.pas
index 6afda84b..b766f290 100644
--- a/src/lib/ffmpeg-0.9/avcodec.pas
+++ b/src/lib/ffmpeg-0.9/avcodec.pas
@@ -625,10 +625,11 @@ const
CH_LAYOUT_STEREO_DOWNMIX = AV_CH_LAYOUT_STEREO_DOWNMIX;
{$IFEND}
-{$IFDEF FF_API_OLD_DECODE_AUDIO}
+// not disabled for the moment KMS 05/2013
+//{$IFDEF FF_API_OLD_DECODE_AUDIO}
{* in bytes *}
AVCODEC_MAX_AUDIO_FRAME_SIZE = 192000; // 1 second of 48khz 32bit audio
-{$ENDIF}
+//{$ENDIF}
(**
* Required number of additionally allocated bytes at the end of the input bitstream for decoding.
@@ -4333,7 +4334,8 @@ function avcodec_open(avctx: PAVCodecContext; codec: PAVCodec): cint;
function avcodec_open2(avctx: PAVCodecContext; codec: PAVCodec; options: PPAVDictionary): cint;
cdecl; external av__codec;
-{$IFDEF FF_API_OLD_DECODE_AUDIO}
+// not disabled for the moment KMS 05/2013
+//{$IFDEF FF_API_OLD_DECODE_AUDIO}
(**
* Wrapper function which calls avcodec_decode_audio4.
*
@@ -4387,7 +4389,7 @@ function avcodec_decode_audio3(avctx: PAVCodecContext; samples: PSmallint;
var frame_size_ptr: cint;
avpkt: PAVPacket): cint;
cdecl; external av__codec; deprecated;
-{$ENDIF}
+//{$ENDIF}
(**
* Decode the audio frame of size avpkt->size from avpkt->data into frame.