aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2012-06-09 11:24:19 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2012-06-09 11:24:19 +0000
commitead5fa2e8697074dfd991e23ebf02e21db8e4616 (patch)
treeb2bbfbc5a82156dc209f3666845b7c13f2e91f4a
parent5d1d06acda578ffcfa6beb3bc5876ad332110dfc (diff)
downloadusdx-ead5fa2e8697074dfd991e23ebf02e21db8e4616.tar.gz
usdx-ead5fa2e8697074dfd991e23ebf02e21db8e4616.tar.xz
usdx-ead5fa2e8697074dfd991e23ebf02e21db8e4616.zip
bug fix of duplicate identifier
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2893 b956fd51-792f-4845-bead-9b4dfca2ff2c
-rw-r--r--src/lib/ffmpeg-0.10/libavutil/samplefmt.pas2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/ffmpeg-0.10/libavutil/samplefmt.pas b/src/lib/ffmpeg-0.10/libavutil/samplefmt.pas
index 1ba6c5a6..80cdd71b 100644
--- a/src/lib/ffmpeg-0.10/libavutil/samplefmt.pas
+++ b/src/lib/ffmpeg-0.10/libavutil/samplefmt.pas
@@ -167,7 +167,7 @@ function av_samples_fill_arrays(audio_data: pointer; linesize: Pcint;
* @return 0 on success or a negative error code on failure
* @see av_samples_fill_arrays()
*)
-function av_samples_alloc(audio_data: pointer; linesize: Pcint; nb_channels: cint;
+function av_samples_alloc(audio_data: pointer; linesize: Pcint;
nb_channels: cint; nb_samples: cint;
sample_fmt: TAVSampleFormat; align: cint): cint;
cdecl; external av__util;