From 317797a84cb1a3fab3983173aee3953345c13d2e Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sun, 30 May 2010 18:57:56 +0000
Subject: update to avcodec 52.72.0. also some cosmetics to opt.pas

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2430 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avcodec.pas | 12 ++++++++++--
 src/lib/ffmpeg/opt.pas     |  6 ++----
 2 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'src/lib/ffmpeg')

diff --git a/src/lib/ffmpeg/avcodec.pas b/src/lib/ffmpeg/avcodec.pas
index 71fb57c3..eff7004c 100644
--- a/src/lib/ffmpeg/avcodec.pas
+++ b/src/lib/ffmpeg/avcodec.pas
@@ -23,7 +23,7 @@
  *
  * Conversion of libavcodec/avcodec.h
  * Min. version: 51.16.0, revision 6577, Sat Oct 7 15:30:46 2006 UTC 
- * Max. version: 52.70.0, revision 23332, Sun May 30 20:30 2010 CET
+ * Max. version: 52.72.0, revision 23338, Sun May 30 20:55 2010 CET
  *
  *)
 
@@ -82,7 +82,7 @@ const
    *)
   (* Max. supported version by this header *)
   LIBAVCODEC_MAX_VERSION_MAJOR   = 52;
-  LIBAVCODEC_MAX_VERSION_MINOR   = 70;
+  LIBAVCODEC_MAX_VERSION_MINOR   = 72;
   LIBAVCODEC_MAX_VERSION_RELEASE = 0;
   LIBAVCODEC_MAX_VERSION = (LIBAVCODEC_MAX_VERSION_MAJOR * VERSION_MAJOR) +
                            (LIBAVCODEC_MAX_VERSION_MINOR * VERSION_MINOR) +
@@ -847,6 +847,14 @@ const
    * as a last resort.
    *)
   CODEC_CAP_SUBFRAMES        = $0100;
+  {$IFEND}
+
+  {$IF LIBAVCODEC_VERSION >= 52071000} // >= 52.71.0
+  (**
+   * Codec is experimental and is thus avoided in favor of non experimental
+   * encoders
+   *)
+  CODEC_CAP_EXPERIMENTAL     = $0200;
   {$IFEND}
 
    //the following defines may change, don't expect compatibility if you use them
diff --git a/src/lib/ffmpeg/opt.pas b/src/lib/ffmpeg/opt.pas
index c755ed35..0e73726f 100644
--- a/src/lib/ffmpeg/opt.pas
+++ b/src/lib/ffmpeg/opt.pas
@@ -15,9 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *)
-
-(*
+ *
  * This is a part of Pascal porting of ffmpeg.
  * - Originally by Victor Zinetz for Delphi and Free Pascal on Windows.
  * - For Mac OS X, some modifications were made by The Creative CAT, denoted as CAT
@@ -25,7 +23,7 @@
  * - Changes and updates by the UltraStar Deluxe Team
  *
  * Conversion of libavcodec/opt.h
- * Max. avcodec version: 52.67.0, revision 23057, Tue May 11 18:17 2010 CET 
+ * Max. avcodec version: 52.72.0, revision 23338, Sun May 30 20:55 2010 CET 
  *
  *)
 
-- 
cgit v1.2.3