fix avformat

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3056 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 22 insertions, 18 deletions

diff --git a/src/lib/ffmpeg-2.1/avformat.pas b/src/lib/ffmpeg-2.1/avformat.pas
index 6c886b0c..ba062cf1 100644
--- a/src/lib/ffmpeg-2.1/avformat.pas
+++ b/src/lib/ffmpeg-2.1/avformat.pas
@@ -514,9 +514,9 @@ const
    * even when user did not explicitly ask for subtitles.
    *)
   AV_DISPOSITION_FORCED    = $0040;
-  AV_DISPOSITION_HEARING_IMPAIRED = $0080;  /**< stream for hearing impaired audiences */
-  AV_DISPOSITION_VISUAL_IMPAIRED  = $0100;  /**< stream for visual impaired audiences */
-  AV_DISPOSITION_CLEAN_EFFECTS    = $0200;  /**< stream without voice */
+  AV_DISPOSITION_HEARING_IMPAIRED = $0080;  (**< stream for hearing impaired audiences *)
+  AV_DISPOSITION_VISUAL_IMPAIRED  = $0100;  (**< stream for visual impaired audiences *)
+  AV_DISPOSITION_CLEAN_EFFECTS    = $0200;  (**< stream without voice *)
 (**
  * The stream is stored in the file as an attached picture/"cover art" (e.g.
  * APIC frame in ID3v2). The single packet associated with it will be returned
@@ -558,6 +558,10 @@ type
   PPAVStream = ^PAVStream;
   PAVStream = ^TAVStream;
   PAVPacketList = ^TAVPacketList;
+  TAVPacketList = record
+    pkt: TAVPacket;
+    next: PAVPacketList;
+  end; (*AVPacketList*)
 
   PPAVProgram = ^PAVProgram;
   PAVProgram = ^TAVProgram;
@@ -794,8 +798,8 @@ type
     AVSTREAM_PARSE_FULL,       (**< full parsing and repack *)
     AVSTREAM_PARSE_HEADERS,    (**< Only parse headers, do not repack. *)
     AVSTREAM_PARSE_TIMESTAMPS, (**< full parsing and interpolation of timestamps for frames not starting on a packet boundary *)
-    AVSTREAM_PARSE_FULL_ONCE   (**< full parsing and repack of the first frame only, only implemented for H.264 currently *)
-    AVSTREAM_PARSE_FULL_RAW = $57415230; // MKTAG(0,'R','A','W'),
+    AVSTREAM_PARSE_FULL_ONCE,  (**< full parsing and repack of the first frame only, only implemented for H.264 currently *)
+    AVSTREAM_PARSE_FULL_RAW = $57415230 // MKTAG(0,'R','A','W'),
                                (**< full parsing and repack with timestamp and position generation by parser for raw
                                     this assumes that each packet in the file contains no demuxer level headers and
                                     just codec level data, otherwise position generation would fail *)
@@ -817,12 +821,13 @@ type
     min_distance: cint;         (**< Minimum distance between this and the previous keyframe, used to avoid unneeded searching. *)
   end;
 
+	Tduration_error = array[0..1] of array[0..MAX_STD_TIMEBASES - 1] of cdouble;
   PStreamInfo = ^TStreamInfo;
   TStreamInfo = record
     last_dts: cint64;
     duration_gcd: cint64;
     duration_count: cint;
-    duration_error: ^array[0..1] of array[0..MAX_STD_TIMEBASES - 1] of cdouble;
+    duration_error: ^Tduration_error;
     codec_info_duration: cint64;
     codec_info_duration_fields: cint64;
     found_decoder: cint;
@@ -1055,9 +1060,6 @@ type
 
   end; (** TAVStream **)
 
-function  av_stream_get_r_frame_rate({const} s: PAVStream): TAVRational;
-procedure av_stream_set_r_frame_rate(s: PAVStream; r: TAVRational);
-
 (**
  * New fields can be added to the end with minor version bumps.
  * Removal, reordering and changes to existing fields require a major
@@ -1152,7 +1154,7 @@ procedure av_stream_set_r_frame_rate(s: PAVStream; r: TAVRational);
      * iformat/oformat.flags. In such a case, the (de)muxer will handle
      * I/O in some other way and this field will be NULL.
      *)
-     pb: PByteIOContext;
+     pb: PAVIOContext;
 
     (* stream info *)
     ctx_flags: cint; (**< Format-specific flags, see AVFMTCTX_xx *)
@@ -1444,6 +1446,11 @@ procedure av_stream_set_r_frame_rate(s: PAVStream; r: TAVRational);
 
 end; (** TAVFormatContext **)
 
+function  av_stream_get_r_frame_rate({const} s: PAVStream): TAVRational;
+  cdecl; external av__format;
+procedure av_stream_set_r_frame_rate(s: PAVStream; r: TAVRational);
+  cdecl; external av__format;
+
 (**
  * Returns the method used to set ctx->duration.
  *
@@ -1452,11 +1459,6 @@ end; (** TAVFormatContext **)
 function av_fmt_ctx_get_duration_estimation_method(ctx: {const} PAVFormatContext): TAVDurationEstimationMethod;
   cdecl; external av__format;
 
-  TAVPacketList = record
-    pkt: TAVPacket;
-    next: PAVPacketList;
-  end; (*AVPacketList*)
-
 (**
  * @defgroup lavf_core Core functions
  * @ingroup libavf
@@ -1621,7 +1623,7 @@ function avformat_alloc_output_context2(ctx: PPAVFormatContext; oformat: PAVOutp
 
 (**
  * @addtogroup lavf_decoding
- * @{
+ * @
  *)
 
 (**
@@ -1680,7 +1682,8 @@ function av_probe_input_format3(pd: PAVProbeData; is_opened: cint; score_ret: Pc
  *)
 function av_probe_input_buffer(pb: PAVIOContext; var fmt: PAVInputFormat;
                           filename: {const} PAnsiChar; logctx: pointer;
-                          offset: cuint; max_probe_size: cuint);
+                          offset: cuint; max_probe_size: cuint): cint;
+  cdecl; external av__format;
   
 (**
  * Open an input stream and read the header. The codecs are not opened.
@@ -2152,7 +2155,7 @@ function av_codec_get_tag(var tags: PAVCodecTag; id: TAVCodecID): cuint;
  * @param tag A pointer to the found tag
  * @return 0 if id was not found in tags, > 0 if it was found
  *)
-function av_codec_get_tag2(var tags: PAVCodecTag; id: TAVCodecID,
+function av_codec_get_tag2(var tags: PAVCodecTag; id: TAVCodecID;
                            tag: Pcuint): cint;
   cdecl; external av__format;
 		      
@@ -2330,6 +2333,7 @@ function av_guess_sample_aspect_ratio(format: PAVFormatContext; stream: PAVStrea
  * @return the guessed (valid) frame rate, 0/1 if no idea
  *)
 function av_guess_frame_rate(ctx: PAVFormatContext; stream: PAVStream; frame: PAVFrame): TAVRational;
+  cdecl; external av__format;
 
 (**
  * Check if the stream st contained in s is matched by the stream specifier