aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c>2014-01-01 15:21:52 +0000
committerbrian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c>2014-01-01 15:21:52 +0000
commitc91704a49d3acb00c25e624c4c1452f727c3be90 (patch)
treea507cf59f5cf9dbf22574e5af9d74dc08536c2e6
parente6b2941a937f2670ecf996e35264c101cf926997 (diff)
downloadusdx-c91704a49d3acb00c25e624c4c1452f727c3be90.tar.gz
usdx-c91704a49d3acb00c25e624c4c1452f727c3be90.tar.xz
usdx-c91704a49d3acb00c25e624c4c1452f727c3be90.zip
Fix in opt.pas
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3065 b956fd51-792f-4845-bead-9b4dfca2ff2c
-rw-r--r--src/lib/ffmpeg-2.1/avutil.pas4
-rw-r--r--src/lib/ffmpeg-2.1/libavutil/opt.pas2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/ffmpeg-2.1/avutil.pas b/src/lib/ffmpeg-2.1/avutil.pas
index 5ce5141b..fa8e74d6 100644
--- a/src/lib/ffmpeg-2.1/avutil.pas
+++ b/src/lib/ffmpeg-2.1/avutil.pas
@@ -227,10 +227,10 @@ function av_int_list_length({const} list: pointer; term: cuint64): cuint;
{$INCLUDE libavutil/pixfmt.pas}
-{$INCLUDE libavutil/opt.pas}
-
{$INCLUDE libavutil/samplefmt.pas}
+{$INCLUDE libavutil/opt.pas}
+
{$INCLUDE libavutil/buffer.pas}
{$INCLUDE libavutil/frame.pas}
diff --git a/src/lib/ffmpeg-2.1/libavutil/opt.pas b/src/lib/ffmpeg-2.1/libavutil/opt.pas
index 8fb80b79..3783431d 100644
--- a/src/lib/ffmpeg-2.1/libavutil/opt.pas
+++ b/src/lib/ffmpeg-2.1/libavutil/opt.pas
@@ -399,7 +399,7 @@ function av_opt_set_image_size(obj: pointer; name: {const} PAnsiChar; w, h,
cdecl; external av__util;
function av_opt_set_pixel_fmt (obj: pointer; name: {const} PAnsiChar; fmt: TAVPixelFormat; search_flags: cint): cint;
cdecl; external av__util;
-function av_opt_set_sample_fmt(obj: pointer; name: {const} PAnsiChar; fmt: TAVPixelFormat; search_flags: cint): cint;
+function av_opt_set_sample_fmt(obj: pointer; name: {const} PAnsiChar; fmt: TAVSampleFormat; search_flags: cint): cint;
cdecl; external av__util;
function av_opt_set_video_rate(obj: pointer; name: {const} PAnsiChar; val: TAVRational; search_flags: cint): cint;
cdecl; external av__util;