diff options
| -rw-r--r-- | src/lib/ffmpeg-2.2/avutil.pas | 10 | ||||
| -rw-r--r-- | src/lib/ffmpeg-2.2/libavcodec/audioconvert.pas | 4 | ||||
| -rw-r--r-- | src/lib/ffmpeg-2.2/libavutil/buffer.pas | 2 | ||||
| -rw-r--r-- | src/lib/ffmpeg-2.2/libavutil/cpu.pas | 7 | ||||
| -rw-r--r-- | src/lib/ffmpeg-2.2/libavutil/dict.pas | 22 | ||||
| -rw-r--r-- | src/lib/ffmpeg-2.2/libavutil/error.pas | 2 | ||||
| -rw-r--r-- | src/lib/ffmpeg-2.2/libavutil/frame.pas | 81 | ||||
| -rw-r--r-- | src/lib/ffmpeg-2.2/libavutil/log.pas | 29 | ||||
| -rw-r--r-- | src/lib/ffmpeg-2.2/libavutil/mathematics.pas | 20 | ||||
| -rw-r--r-- | src/lib/ffmpeg-2.2/libavutil/mem.pas | 24 | ||||
| -rw-r--r-- | src/lib/ffmpeg-2.2/libavutil/opt.pas | 2 | ||||
| -rw-r--r-- | src/lib/ffmpeg-2.2/libavutil/pixfmt.pas | 11 | ||||
| -rw-r--r-- | src/lib/ffmpeg-2.2/libavutil/samplefmt.pas | 2 |
13 files changed, 177 insertions, 39 deletions
diff --git a/src/lib/ffmpeg-2.2/avutil.pas b/src/lib/ffmpeg-2.2/avutil.pas index fa8e74d6..10523b6f 100644 --- a/src/lib/ffmpeg-2.2/avutil.pas +++ b/src/lib/ffmpeg-2.2/avutil.pas @@ -24,7 +24,7 @@ * Conversions of * * libavutil/avutil.h: - * version: 52.48.100 + * version: 52.66.100 * *) @@ -213,6 +213,14 @@ function av_int_list_length_for_size(elsize: cuint; *) function av_int_list_length({const} list: pointer; term: cuint64): cuint; +(** + * Open a file using a UTF-8 filename. + * The API of this function matches POSIX fopen(), errors are returned through + * errno. + *) +function av_fopen_utf8(path: {const} Pchar; mode: {const} Pchar): PAVFile; + cdecl; external av__util; + {$INCLUDE libavutil/cpu.pas} {$INCLUDE libavutil/dict.pas} diff --git a/src/lib/ffmpeg-2.2/libavcodec/audioconvert.pas b/src/lib/ffmpeg-2.2/libavcodec/audioconvert.pas index 116b26ac..7ac9e4bd 100644 --- a/src/lib/ffmpeg-2.2/libavcodec/audioconvert.pas +++ b/src/lib/ffmpeg-2.2/libavcodec/audioconvert.pas @@ -117,6 +117,10 @@ type AV_MATRIX_ENCODING_NONE, AV_MATRIX_ENCODING_DOLBY, AV_MATRIX_ENCODING_DPLII, + AV_MATRIX_ENCODING_DPLIIX, + AV_MATRIX_ENCODING_DPLIIZ, + AV_MATRIX_ENCODING_DOLBYEX, + AV_MATRIX_ENCODING_DOLBYHEADPHONE, AV_MATRIX_ENCODING_NB ); diff --git a/src/lib/ffmpeg-2.2/libavutil/buffer.pas b/src/lib/ffmpeg-2.2/libavutil/buffer.pas index 6eead1dc..b855b9ab 100644 --- a/src/lib/ffmpeg-2.2/libavutil/buffer.pas +++ b/src/lib/ffmpeg-2.2/libavutil/buffer.pas @@ -23,7 +23,7 @@ * - Changes and updates by the UltraStar Deluxe Team * * Conversion of libavutil/buffer.h - * avutil version 52.48.100 + * avutil version 52.66.100 * *) diff --git a/src/lib/ffmpeg-2.2/libavutil/cpu.pas b/src/lib/ffmpeg-2.2/libavutil/cpu.pas index 4cb468a8..631cc255 100644 --- a/src/lib/ffmpeg-2.2/libavutil/cpu.pas +++ b/src/lib/ffmpeg-2.2/libavutil/cpu.pas @@ -19,7 +19,7 @@ * - Changes and updates by the UltraStar Deluxe Team * * Conversion of libavutil/cpu.h - * avutil version 52.48.100 - 52.48.101 + * avutil version 52.66.100 * *) @@ -51,7 +51,10 @@ const AV_CPU_FLAG_CMOV = $1001000; ///< supports cmov instruction AV_CPU_FLAG_AVX2 = $8000; ///< AVX2 functions: requires OS support even if YMM registers aren't used - + AV_CPU_FLAG_FMA3 = $10000; ///< Haswell FMA3 functions + AV_CPU_FLAG_BMI1 = $20000; ///< Bit Manipulation Instruction Set 1 + AV_CPU_FLAG_BMI2 = $40000; ///< Bit Manipulation Instruction Set 2 + AV_CPU_FLAG_ALTIVEC = $0001; ///< standard AV_CPU_FLAG_ARMV5TE = (1 << 0); diff --git a/src/lib/ffmpeg-2.2/libavutil/dict.pas b/src/lib/ffmpeg-2.2/libavutil/dict.pas index 21886657..0d9ffabd 100644 --- a/src/lib/ffmpeg-2.2/libavutil/dict.pas +++ b/src/lib/ffmpeg-2.2/libavutil/dict.pas @@ -19,7 +19,7 @@ * This is a part of the Pascal port of ffmpeg. * * Conversion of libavutil/dict.h - * avutil version 52.38.100 + * avutil version 52.66.100 * *) @@ -27,9 +27,9 @@ const AV_DICT_MATCH_CASE = 1; AV_DICT_IGNORE_SUFFIX = 2; AV_DICT_DONT_STRDUP_KEY = 4; (**< Take ownership of a key that's been - allocated with av_malloc() and children. *) + allocated with av_malloc() or another memory allocation function. *) AV_DICT_DONT_STRDUP_VAL = 8; (**< Take ownership of a value that's been - allocated with av_malloc() and chilren. *) + allocated with av_malloc() or another memory allocation function. *) AV_DICT_DONT_OVERWRITE = 16; (**< Don't overwrite existing entries. *) AV_DICT_APPEND = 32; (**< If the entry already exists, append to it. Note that no delimiter is added, the strings are simply concatenated. *) @@ -53,10 +53,17 @@ type (** * Get a dictionary entry with matching key. * + * The returned entry key or value must not be changed, or it will + * cause undefined behavior. + * + * To iterate through all the dictionary entries, you can set the matching key + * to the null string "" and set the AV_DICT_IGNORE_SUFFIX flag. + * + * @param key matching key * @param prev Set to the previous matching element to find the next. * If set to NULL the first matching element is returned. - * @param flags Allows case as well as suffix-insensitive comparisons. - * @return Found entry or NULL, changing key or value leads to undefined behavior. + * @param flags a collection of AV_DICT_* flags controlling how the entry is retrieved + * @return found entry or NULL in case no matching entry was found in the dictionary *) function av_dict_get(m: PAVDictionary; {const} key: PAnsiChar; {const} prev: PAVDictionaryEntry; flags: cint): PAVDictionaryEntry; cdecl; external av__util; @@ -84,7 +91,10 @@ function av_dict_set(var pm: PAVDictionary; {const} key: PAnsiChar; {const} valu cdecl; external av__util; (** - * Parse the key/value pairs list and add to a dictionary. + * Parse the key/value pairs list and add the parsed entries to a dictionary. + * + * In case of failure, all the successfully set entries are stored in + * *pm. You may need to manually free the created dictionary. * * @param key_val_sep a 0-terminated list of characters used to separate * key from value diff --git a/src/lib/ffmpeg-2.2/libavutil/error.pas b/src/lib/ffmpeg-2.2/libavutil/error.pas index 5ddd2a74..d5f76639 100644 --- a/src/lib/ffmpeg-2.2/libavutil/error.pas +++ b/src/lib/ffmpeg-2.2/libavutil/error.pas @@ -19,7 +19,7 @@ * - Changes and updates by the UltraStar Deluxe Team * * Conversion of libavutil/error.h - * avutil version 52.38.100 + * avutil version 52.66.100 * *) diff --git a/src/lib/ffmpeg-2.2/libavutil/frame.pas b/src/lib/ffmpeg-2.2/libavutil/frame.pas index 725ebce1..f6b259ab 100644 --- a/src/lib/ffmpeg-2.2/libavutil/frame.pas +++ b/src/lib/ffmpeg-2.2/libavutil/frame.pas @@ -23,7 +23,7 @@ * - Changes and updates by the UltraStar Deluxe Team * * Conversion of libavutil/frame.h - * avutil version 52.48.100 + * avutil version 52.66.100 * *) @@ -37,14 +37,16 @@ const type TAVColorSpace = ( AVCOL_SPC_RGB = 0, - AVCOL_SPC_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B + AVCOL_SPC_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B AVCOL_SPC_UNSPECIFIED = 2, AVCOL_SPC_FCC = 4, - AVCOL_SPC_BT470BG = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601 - AVCOL_SPC_SMPTE170M = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above + AVCOL_SPC_BT470BG = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601 + AVCOL_SPC_SMPTE170M = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above AVCOL_SPC_SMPTE240M_ = 7, - AVCOL_SPC_YCGCO = 8, - AVCOL_SPC_NB ///< Not part of ABI + AVCOL_SPC_YCGCO = 8, ///< Used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16 + AVCOL_SPC_BT2020_NCL = 9, ///< ITU-R BT2020 non-constant luminance system + AVCOL_SPC_BT2020_CL = 10, ///< ITU-R BT2020 constant luminance system + AVCOL_SPC_NB ///< Not part of ABI ); TAVColorRange = ( @@ -54,11 +56,39 @@ type AVCOL_RANGE_NB ///< Not part of ABI ); + + (** + * @defgroup lavu_frame AVFrame + * @ingroup lavu_data + * + * @{ + * AVFrame is an abstraction for reference-counted raw multimedia data. + *) TAVFrameSideDataType = ( (** * The data is the AVPanScan struct defined in libavcodec. *) - AV_FRAME_DATA_PANSCAN + AV_FRAME_DATA_PANSCAN, + (** + * ATSC A53 Part 4 Closed Captions. + * A53 CC bitstream is stored as uint8_t in AVFrameSideData.data. + * The number of bytes of CC data is AVFrameSideData.size. + *) + AV_FRAME_DATA_A53_CC, + (** + * Stereoscopic 3d metadata. + * The data is the AVStereo3D struct defined in libavutil/stereo3d.h. + *) + AV_FRAME_DATA_STEREO3D, + (** + * The data is the AVMatrixEncoding enum defined in libavutil/channel_layout.h. + *) + AV_FRAME_DATA_MATRIXENCODING, + (** + * Metadata relevant to a downmix procedure. + * The data is the AVDownmixInfo struct defined in libavutil/downmix_info.h. + *) + AV_FRAME_DATA_DOWNMIX_INFO ); PAVFrameSideData = ^TAVFrameSideData; @@ -429,6 +459,23 @@ type nb_side_data: cint; (** + * @defgroup lavu_frame_flags AV_FRAME_FLAGS + * Flags describing additional frame properties. + * + * @{ + *) + + (** + * The frame data may be corrupted, e.g. due to decoding errors. + *) + {$define AV_FRAME_FLAG_CORRUPT := (1 << 0)} + + (** + * Frame flags, a combination of @ref lavu_frame_flags + *) + flags: cint; + + (** * frame timestamp estimated using various heuristics, in stream time base * Code outside libavcodec should access this field using: * av_frame_get_best_effort_timestamp(frame) @@ -604,7 +651,7 @@ procedure av_frame_free(frame: PPAVFrame); cdecl; external av__codec; (** - * Setup a new reference to the data described by a given frame. + * Set up a new reference to the data described by the source frame. * * Copy frame properties from src to dst and create a new reference for each * AVBufferRef from src. @@ -614,7 +661,7 @@ procedure av_frame_free(frame: PPAVFrame); * * @return 0 on success, a negative AVERROR on error *) -function av_frame_ref(dst: PAVFrame; src: PAVFrame): cint; +function av_frame_ref(dst: PAVFrame; src: {const} PAVFrame): cint; cdecl; external av__codec; (** @@ -624,7 +671,7 @@ function av_frame_ref(dst: PAVFrame; src: PAVFrame): cint; * * @return newly created AVFrame on success, NULL on error. *) -function av_frame_clone(src: PAVFrame): PAVFrame; +function av_frame_clone(src: {const} PAVFrame): PAVFrame; cdecl; external av__codec; (** @@ -689,6 +736,20 @@ function av_frame_make_writable(frame: PAVFrame): cint; cdecl; external av__codec; (** + * Copy the frame data from src to dst. + * + * This function does not allocate anything, dst must be already initialized and + * allocated with the same parameters as src. + * + * This function only copies the frame data (i.e. the contents of the data / + * extended data arrays), not any other properties. + * + * @return >= 0 on success, a negative AVERROR on error. + *) +function av_frame_copy(dst: PAVFrame, src: {const} PAVFrame): cint; + cdecl; external av__codec; + +(** * Copy only "metadata" fields from src to dst. * * Metadata for the purpose of this function are those fields that do not affect diff --git a/src/lib/ffmpeg-2.2/libavutil/log.pas b/src/lib/ffmpeg-2.2/libavutil/log.pas index 8bcc95bf..e47cfc19 100644 --- a/src/lib/ffmpeg-2.2/libavutil/log.pas +++ b/src/lib/ffmpeg-2.2/libavutil/log.pas @@ -19,7 +19,7 @@ * - Changes and updates by the UltraStar Deluxe Team * * Conversion of libavutil/log.h - * avutil version 52.38.100 + * avutil version 52.66.100 * *) @@ -50,23 +50,34 @@ type AV_OPT_TYPE_RATIONAL, AV_OPT_TYPE_BINARY, ///< offset must point to a pointer immediately followed by an int for the length AV_OPT_TYPE_CONST = 128, - AV_OPT_TYPE_CHANNEL_LAYOUT = $43484C41, ///< MKBETAG('C','H','L','A'), - AV_OPT_TYPE_COLOR = $434F4C52, ///< MKBETAG('C','O','L','R'), + AV_OPT_TYPE_IMAGE_SIZE = $53495A45, ///< MKBETAG('S','I','Z','E'), offset must point to two consecutive integers + AV_OPT_TYPE_PIXEL_FMT = $50464D54, ///< MKBETAG('P','F','M','T') + AV_OPT_TYPE_SAMPLE_FMT = $53464D54, ///< MKBETAG('S','F','M','T') + AV_OPT_TYPE_VIDEO_RATE = $56524154 ///< MKBETAG('V','R','A','T'), offset must point to TAVRational AV_OPT_TYPE_DURATION = $44555220, ///< MKBETAG('D','U','R',' '), - AV_OPT_TYPE_PIXEL_FMT = $50464D54, ///< MKBETAG('P','F','M','T') - AV_OPT_TYPE_SAMPLE_FMT = $53464D54, ///< MKBETAG('S','F','M','T') - AV_OPT_TYPE_IMAGE_SIZE = $53495A45, ///< MKBETAG('S','I','Z','E'), offset must point to two consecutive integers - AV_OPT_TYPE_VIDEO_RATE = $56524154 ///< MKBETAG('V','R','A','T'), offset must point to TAVRational + AV_OPT_TYPE_COLOR = $434F4C52, ///< MKBETAG('C','O','L','R'), + AV_OPT_TYPE_CHANNEL_LAYOUT = $43484C41, ///< MKBETAG('C','H','L','A'), {$ENDIF} ); const AV_OPT_FLAG_ENCODING_PARAM = 1; ///< a generic parameter which can be set by the user for muxing or encoding AV_OPT_FLAG_DECODING_PARAM = 2; ///< a generic parameter which can be set by the user for demuxing or decoding +{$IFDEF FF_API_OPT_TYPE_METADATA} AV_OPT_FLAG_METADATA = 4; ///< some data extracted or inserted into the file like title, comment, ... +{$ENDIF} AV_OPT_FLAG_AUDIO_PARAM = 8; AV_OPT_FLAG_VIDEO_PARAM = 16; AV_OPT_FLAG_SUBTITLE_PARAM = 32; + (** + * The option is inteded for exporting values to the caller. + *) + AV_OPT_FLAG_EXPORT = 64; + (** + * The option may not be set through the AVOptions API, only read. + * This flag only makes sense when AV_OPT_FLAG_EXPORT is also set. + *) + AV_OPT_FLAG_READONLY = 128; AV_OPT_FLAG_FILTERING_PARAM = 1 shl 16; ///< a generic parameter which can be set by the user for filtering type @@ -370,10 +381,10 @@ void av_log_set_callback(void (*callback)(void*, int, const char*, va_list)); * lavu_log_constants "Logging Constant". * @param fmt The format string (printf-compatible) that specifies how * subsequent arguments are converted to output. - * @param ap The arguments referenced by the format string. + * @param vl The arguments referenced by the format string. *) {** to be translated if needed -void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl); +void av_log_default_callback(void* avcl, int level, const char *fmt, va_list vl); **} (** diff --git a/src/lib/ffmpeg-2.2/libavutil/mathematics.pas b/src/lib/ffmpeg-2.2/libavutil/mathematics.pas index 9964b6fd..993cefad 100644 --- a/src/lib/ffmpeg-2.2/libavutil/mathematics.pas +++ b/src/lib/ffmpeg-2.2/libavutil/mathematics.pas @@ -22,7 +22,7 @@ * - Changes and updates by the UltraStar Deluxe Team * * Conversion of libavutil/mathematics.h - * avutil version 52.38.100 + * avutil version 52.66.100 * *) @@ -33,6 +33,7 @@ const M_LOG2_10 = 3.32192809488736234787; // log_2 10 M_PHI = 1.61803398874989484820; // phi / golden ratio M_PI = 3.14159265358979323846; // pi + M_PI_2 = 1.57079632679489661923; // pi/2 M_SQRT1_2 = 0.70710678118654752440; // 1/sqrt(2) M_SQRT2 = 1.41421356237309504880; // sqrt(2) NAN = $7fc00000; @@ -120,11 +121,24 @@ function av_compare_mod(a: cuint64; b: cuint64; modVar: cuint64): cint64; * Rescale a timestamp while preserving known durations. * * @param in_ts Input timestamp - * @param in_tb Input timesbase + * @param in_tb Input timebase * @param fs_tb Duration and *last timebase * @param duration duration till the next call - * @param out_tb Output timesbase + * @param out_tb Output timebase *) function av_rescale_delta(in_tb: TAVRational; in_ts: cint64; fs_tb: TAVRational; duration: cint; last: Pcint64; out_tb: TAVRational): cint64; cdecl; external av__util; +(** + * Add a value to a timestamp. + * + * This function gurantees that when the same value is repeatly added that + * no accumulation of rounding errors occurs. + * + * @param ts Input timestamp + * @param ts_tb Input timestamp timebase + * @param inc value to add to ts + * @param inc_tb inc timebase + *) +function av_add_stable(ts_tb: TAVRational; ts: cint64; inc_tb: TAVRational; inc: cint64): cint64; + cdecl; external av__util; diff --git a/src/lib/ffmpeg-2.2/libavutil/mem.pas b/src/lib/ffmpeg-2.2/libavutil/mem.pas index d7e0ca90..65ffb25a 100644 --- a/src/lib/ffmpeg-2.2/libavutil/mem.pas +++ b/src/lib/ffmpeg-2.2/libavutil/mem.pas @@ -19,7 +19,7 @@ * - Changes and updates by the UltraStar Deluxe Team * * Conversion of libavutil/mem.h - * avutil version 52.38.100 + * avutil version 52.66.100 * *) @@ -301,3 +301,25 @@ procedure av_max_alloc(max: size_t); procedure av_memcpy_backptr(dst: Pcuint8; back: cint; cnt: cint); cdecl; external av__util; +(** + * Reallocate the given block if it is not large enough, otherwise do nothing. + * + * @see av_realloc + *) +procedure av_fast_realloc(ptr: pointer; size: Pcuint; min_size: size_t); + cdecl; external av__util; + +(** + * Allocate a buffer, reusing the given one if large enough. + * + * Contrary to av_fast_realloc the current buffer contents might not be + * preserved and on error the old buffer is freed, thus no special + * handling to avoid memleaks is necessary. + * + * @param ptr pointer to pointer to already allocated buffer, overwritten with pointer to new buffer + * @param size size of the buffer *ptr points to + * @param min_size minimum size of *ptr buffer after returning, *ptr will be NULL and + * *size 0 if an error occurred. + *) +procedure av_fast_malloc(ptr: pointer; size: Pcuint; min_size: size_t); + cdecl; external av__util; diff --git a/src/lib/ffmpeg-2.2/libavutil/opt.pas b/src/lib/ffmpeg-2.2/libavutil/opt.pas index 3783431d..655ccf22 100644 --- a/src/lib/ffmpeg-2.2/libavutil/opt.pas +++ b/src/lib/ffmpeg-2.2/libavutil/opt.pas @@ -23,7 +23,7 @@ * - Changes and updates by the UltraStar Deluxe Team * * Conversion of libavutil/opt.h - * avutil version 52.38.100 + * avutil version 52.66.100 * *) diff --git a/src/lib/ffmpeg-2.2/libavutil/pixfmt.pas b/src/lib/ffmpeg-2.2/libavutil/pixfmt.pas index 09a0aff0..bd3cba6e 100644 --- a/src/lib/ffmpeg-2.2/libavutil/pixfmt.pas +++ b/src/lib/ffmpeg-2.2/libavutil/pixfmt.pas @@ -19,7 +19,7 @@ * - Changes and updates by the UltraStar Deluxe Team * * Conversion of libavutil/pixfmt.h - * avutil version 52.48.100 + * avutil version 52.66.100 * *) @@ -81,9 +81,12 @@ type AV_PIX_FMT_PAL8, ///< 8 bit with PIX_FMT_RGB32 palette AV_PIX_FMT_YUVJ420P, ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range AV_PIX_FMT_YUVJ422P, ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range - AV_PIX_FMT_YUVJ444P, ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range + AV_PIX_FMT_YUVJ444P, ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range +{$IFDEF FF_API_XVMC} AV_PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing AV_PIX_FMT_XVMC_MPEG2_IDCT, + {$define AV_PIX_FMT_XVMC := (AV_PIX_FMT_XVMC_MPEG2_IDCT)} +{$ENDIF} AV_PIX_FMT_UYVY422, ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1 AV_PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3 AV_PIX_FMT_BGR8, ///< packed RGB 3:3:2, 8bpp, (msb)2B 3G 3R(lsb) @@ -262,7 +265,9 @@ type AV_PIX_FMT_BAYER_GBRG16BE, ///< bayer, GBGB..(odd line), RGRG..(even line), 16-bit samples, big-endian */ AV_PIX_FMT_BAYER_GRBG16LE, ///< bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, little-endian */ AV_PIX_FMT_BAYER_GRBG16BE, ///< bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, big-endian */ - +{$ifndef FF_API_XVMC} + AV_PIX_FMT_XVMC, ///< XVideo Motion Acceleration via common packet passing +{$endif} AV_PIX_FMT_NB ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions ); diff --git a/src/lib/ffmpeg-2.2/libavutil/samplefmt.pas b/src/lib/ffmpeg-2.2/libavutil/samplefmt.pas index 1da4372a..2a28ad7e 100644 --- a/src/lib/ffmpeg-2.2/libavutil/samplefmt.pas +++ b/src/lib/ffmpeg-2.2/libavutil/samplefmt.pas @@ -19,7 +19,7 @@ * This is a part of the Pascal port of ffmpeg. * * Conversion of libavutil/samplefmt.h - * avutil version 52.48.100 + * avutil version 52.66.100 * *) |