From c91704a49d3acb00c25e624c4c1452f727c3be90 Mon Sep 17 00:00:00 2001
From: brian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 1 Jan 2014 15:21:52 +0000
Subject: Fix in opt.pas

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3065 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg-2.1/avutil.pas        | 4 ++--
 src/lib/ffmpeg-2.1/libavutil/opt.pas | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/lib')

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;
-- 
cgit v1.2.3