Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2024-11-24 06:50:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated FFmpeg.

Browse Source
This commit is contained in:
Christopher Snowhill 2017-11-11 20:09:33 -08:00
parent 07f6d1dbef
commit cfc17019cc
46 changed files with 491 additions and 1579 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -19,8 +19,8 @@ or you can get them from here: https://github.com/kode54/vgmstream
(also here: https://f.losno.co/vgmstream-win32-deps.zip, may not be latest).
Put ```libvorbis.dll```, ```libmpg123-0.dll```, ```libg7221_decode.dll```, ```libg719_decode.dll```,
```at3plusdecoder.dll```, ```avcodec-vgmstream-57.dll```, ```avformat-vgmstream-57.dll```,
```avutil-vgmstream-55.dll``` and ```swresample-vgmstream-2.dll``` somewhere Windows can
```at3plusdecoder.dll```, ```avcodec-vgmstream-58.dll```, ```avformat-vgmstream-58.dll```,
```avutil-vgmstream-56.dll``` and ```swresample-vgmstream-3.dll``` somewhere Windows can
find them.
For Winamp/XMPlay/```test.exe``` this means in the directory with the .exe, or in a
system directory, or any other directory in the PATH variable.

36
ext_includes/libavcodec/ac3_parser.h Normal file
View File

@ -0,0 +1,36 @@
/*
* AC-3 parser prototypes
* Copyright (c) 2003 Fabrice Bellard
* Copyright (c) 2003 Michael Niedermayer
*
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_AC3_PARSER_H
#define AVCODEC_AC3_PARSER_H
#include <stddef.h>
#include <stdint.h>
/**
* Extract the bitstream ID and the frame size from AC-3 data.
*/
int av_ac3_parse_header(const uint8_t *buf, size_t size,
uint8_t *bitstream_id, uint16_t *frame_size);
#endif /* AVCODEC_AC3_PARSER_H */

37
ext_includes/libavcodec/adts_parser.h Normal file
View File

@ -0,0 +1,37 @@
/*
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_ADTS_PARSER_H
#define AVCODEC_ADTS_PARSER_H
#include <stddef.h>
#include <stdint.h>
#define AV_AAC_ADTS_HEADER_SIZE 7
/**
* Extract the number of samples and frames from AAC data.
* @param[in] buf pointer to AAC data buffer
* @param[out] samples Pointer to where number of samples is written
* @param[out] frames Pointer to where number of frames is written
* @return Returns 0 on success, error code on failure.
*/
int av_adts_header_parse(const uint8_t *buf, uint32_t *samples,
uint8_t *frames);
#endif /* AVCODEC_ADTS_PARSER_H */

813
ext_includes/libavcodec/avcodec.h
View File

File diff suppressed because it is too large Load Diff

109
ext_includes/libavcodec/vaapi.h
View File

@ -77,115 +77,6 @@ struct attribute_deprecated vaapi_context {
* - decoding: Set by user
*/
uint32_t context_id;
#if FF_API_VAAPI_CONTEXT
/**
* VAPictureParameterBuffer ID
*
* - encoding: unused
* - decoding: Set by libavcodec
*/
attribute_deprecated
uint32_t pic_param_buf_id;
/**
* VAIQMatrixBuffer ID
*
* - encoding: unused
* - decoding: Set by libavcodec
*/
attribute_deprecated
uint32_t iq_matrix_buf_id;
/**
* VABitPlaneBuffer ID (for VC-1 decoding)
*
* - encoding: unused
* - decoding: Set by libavcodec
*/
attribute_deprecated
uint32_t bitplane_buf_id;
/**
* Slice parameter/data buffer IDs
*
* - encoding: unused
* - decoding: Set by libavcodec
*/
attribute_deprecated
uint32_t *slice_buf_ids;
/**
* Number of effective slice buffer IDs to send to the HW
*
* - encoding: unused
* - decoding: Set by libavcodec
*/
attribute_deprecated
unsigned int n_slice_buf_ids;
/**
* Size of pre-allocated slice_buf_ids
*
* - encoding: unused
* - decoding: Set by libavcodec
*/
attribute_deprecated
unsigned int slice_buf_ids_alloc;
/**
* Pointer to VASliceParameterBuffers
*
* - encoding: unused
* - decoding: Set by libavcodec
*/
attribute_deprecated
void *slice_params;
/**
* Size of a VASliceParameterBuffer element
*
* - encoding: unused
* - decoding: Set by libavcodec
*/
attribute_deprecated
unsigned int slice_param_size;
/**
* Size of pre-allocated slice_params
*
* - encoding: unused
* - decoding: Set by libavcodec
*/
attribute_deprecated
unsigned int slice_params_alloc;
/**
* Number of slices currently filled in
*
* - encoding: unused
* - decoding: Set by libavcodec
*/
attribute_deprecated
unsigned int slice_count;
/**
* Pointer to slice data buffer base
* - encoding: unused
* - decoding: Set by libavcodec
*/
attribute_deprecated
const uint8_t *slice_data;
/**
* Current size of slice data
*
* - encoding: unused
* - decoding: Set by libavcodec
*/
attribute_deprecated
uint32_t slice_data_size;
#endif
};
/* @} */

230
ext_includes/libavcodec/vda.h
View File

@ -1,230 +0,0 @@
/*
* VDA HW acceleration
*
* copyright (c) 2011 Sebastien Zwickert
*
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_VDA_H
#define AVCODEC_VDA_H
/**
* @file
* @ingroup lavc_codec_hwaccel_vda
* Public libavcodec VDA header.
*/
#include "libavcodec/avcodec.h"
#include <stdint.h>
// emmintrin.h is unable to compile with -std=c99 -Werror=missing-prototypes
// http://openradar.appspot.com/8026390
#undef __GNUC_STDC_INLINE__
#define Picture QuickdrawPicture
#include <VideoDecodeAcceleration/VDADecoder.h>
#undef Picture
#include "libavcodec/version.h"
// extra flags not defined in VDADecoder.h
enum {
kVDADecodeInfo_Asynchronous = 1UL << 0,
kVDADecodeInfo_FrameDropped = 1UL << 1
};
/**
* @defgroup lavc_codec_hwaccel_vda VDA
* @ingroup lavc_codec_hwaccel
*
* @{
*/
/**
* This structure is used to provide the necessary configurations and data
* to the VDA FFmpeg HWAccel implementation.
*
* The application must make it available as AVCodecContext.hwaccel_context.
*/
struct vda_context {
/**
* VDA decoder object.
*
* - encoding: unused
* - decoding: Set/Unset by libavcodec.
*/
VDADecoder decoder;
/**
* The Core Video pixel buffer that contains the current image data.
*
* encoding: unused
* decoding: Set by libavcodec. Unset by user.
*/
CVPixelBufferRef cv_buffer;
/**
* Use the hardware decoder in synchronous mode.
*
* encoding: unused
* decoding: Set by user.
*/
int use_sync_decoding;
/**
* The frame width.
*
* - encoding: unused
* - decoding: Set/Unset by user.
*/
int width;
/**
* The frame height.
*
* - encoding: unused
* - decoding: Set/Unset by user.
*/
int height;
/**
* The frame format.
*
* - encoding: unused
* - decoding: Set/Unset by user.
*/
int format;
/**
* The pixel format for output image buffers.
*
* - encoding: unused
* - decoding: Set/Unset by user.
*/
OSType cv_pix_fmt_type;
/**
* unused
*/
uint8_t *priv_bitstream;
/**
* unused
*/
int priv_bitstream_size;
/**
* unused
*/
int priv_allocated_size;
/**
* Use av_buffer to manage buffer.
* When the flag is set, the CVPixelBuffers returned by the decoder will
* be released automatically, so you have to retain them if necessary.
* Not setting this flag may cause memory leak.
*
* encoding: unused
* decoding: Set by user.
*/
int use_ref_buffer;
};
/** Create the video decoder. */
int ff_vda_create_decoder(struct vda_context *vda_ctx,
uint8_t *extradata,
int extradata_size);
/** Destroy the video decoder. */
int ff_vda_destroy_decoder(struct vda_context *vda_ctx);
/**
* This struct holds all the information that needs to be passed
* between the caller and libavcodec for initializing VDA decoding.
* Its size is not a part of the public ABI, it must be allocated with
* av_vda_alloc_context() and freed with av_free().
*/
typedef struct AVVDAContext {
/**
* VDA decoder object. Created and freed by the caller.
*/
VDADecoder decoder;
/**
* The output callback that must be passed to VDADecoderCreate.
* Set by av_vda_alloc_context().
*/
VDADecoderOutputCallback output_callback;
/**
* CVPixelBuffer Format Type that VDA will use for decoded frames; set by
* the caller.
*/
OSType cv_pix_fmt_type;
} AVVDAContext;
/**
* Allocate and initialize a VDA context.
*
* This function should be called from the get_format() callback when the caller
* selects the AV_PIX_FMT_VDA format. The caller must then create the decoder
* object (using the output callback provided by libavcodec) that will be used
* for VDA-accelerated decoding.
*
* When decoding with VDA is finished, the caller must destroy the decoder
* object and free the VDA context using av_free().
*
* @return the newly allocated context or NULL on failure
*/
AVVDAContext *av_vda_alloc_context(void);
/**
* This is a convenience function that creates and sets up the VDA context using
* an internal implementation.
*
* @param avctx the corresponding codec context
*
* @return >= 0 on success, a negative AVERROR code on failure
*/
int av_vda_default_init(AVCodecContext *avctx);
/**
* This is a convenience function that creates and sets up the VDA context using
* an internal implementation.
*
* @param avctx the corresponding codec context
* @param vdactx the VDA context to use
*
* @return >= 0 on success, a negative AVERROR code on failure
*/
int av_vda_default_init2(AVCodecContext *avctx, AVVDAContext *vdactx);
/**
* This function must be called to free the VDA context initialized with
* av_vda_default_init().
*
* @param avctx the corresponding codec context
*/
void av_vda_default_free(AVCodecContext *avctx);
/**
* @}
*/
#endif /* AVCODEC_VDA_H */

77
ext_includes/libavcodec/vdpau.h
View File

@ -57,15 +57,6 @@
#include "avcodec.h"
#include "version.h"
#if FF_API_BUFS_VDPAU
union AVVDPAUPictureInfo {
VdpPictureInfoH264 h264;
VdpPictureInfoMPEG1Or2 mpeg;
VdpPictureInfoVC1 vc1;
VdpPictureInfoMPEG4Part2 mpeg4;
};
#endif
struct AVCodecContext;
struct AVFrame;
@ -102,40 +93,6 @@ typedef struct AVVDPAUContext {
*/
VdpDecoderRender *render;
#if FF_API_BUFS_VDPAU
/**
* VDPAU picture information
*
* Set by libavcodec.
*/
attribute_deprecated
union AVVDPAUPictureInfo info;
/**
* Allocated size of the bitstream_buffers table.
*
* Set by libavcodec.
*/
attribute_deprecated
int bitstream_buffers_allocated;
/**
* Useful bitstream buffers in the bitstream buffers table.
*
* Set by libavcodec.
*/
attribute_deprecated
int bitstream_buffers_used;
/**
* Table of bitstream buffers.
* The user is responsible for freeing this buffer using av_freep().
*
* Set by libavcodec.
*/
attribute_deprecated
VdpBitstreamBuffer *bitstream_buffers;
#endif
AVVDPAU_Render2 render2;
} AVVDPAUContext;
@ -214,40 +171,6 @@ attribute_deprecated
int av_vdpau_get_profile(AVCodecContext *avctx, VdpDecoderProfile *profile);
#endif
#if FF_API_CAP_VDPAU
/** @brief The videoSurface is used for rendering. */
#define FF_VDPAU_STATE_USED_FOR_RENDER 1
/**
* @brief The videoSurface is needed for reference/prediction.
* The codec manipulates this.
*/
#define FF_VDPAU_STATE_USED_FOR_REFERENCE 2
/**
* @brief This structure is used as a callback between the FFmpeg
* decoder (vd_) and presentation (vo_) module.
* This is used for defining a video frame containing surface,
* picture parameter, bitstream information etc which are passed
* between the FFmpeg decoder and its clients.
*/
struct vdpau_render_state {
VdpVideoSurface surface; ///< Used as rendered surface, never changed.
int state; ///< Holds FF_VDPAU_STATE_* values.
/** picture parameter information for all supported codecs */
union AVVDPAUPictureInfo info;
/** Describe size/location of the compressed video data.
Set to 0 when freeing bitstream_buffers. */
int bitstream_buffers_allocated;
int bitstream_buffers_used;
/** The user is responsible for freeing this buffer using av_freep(). */
VdpBitstreamBuffer *bitstream_buffers;
};
#endif
/* @}*/
#endif /* AVCODEC_VDPAU_H */

124
ext_includes/libavcodec/version.h
View File

@ -27,8 +27,8 @@
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR 108
#define LIBAVCODEC_VERSION_MAJOR 58
#define LIBAVCODEC_VERSION_MINOR 3
#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
@ -51,136 +51,18 @@
* at once through the bump. This improves the git bisect-ability of the change.
*/
#ifndef FF_API_VIMA_DECODER
#define FF_API_VIMA_DECODER (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_AUDIO_CONVERT
#define FF_API_AUDIO_CONVERT (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_AVCODEC_RESAMPLE
#define FF_API_AVCODEC_RESAMPLE FF_API_AUDIO_CONVERT
#endif
#ifndef FF_API_MISSING_SAMPLE
#define FF_API_MISSING_SAMPLE (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_LOWRES
#define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_CAP_VDPAU
#define FF_API_CAP_VDPAU (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_BUFS_VDPAU
#define FF_API_BUFS_VDPAU (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_VOXWARE
#define FF_API_VOXWARE (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_SET_DIMENSIONS
#define FF_API_SET_DIMENSIONS (LIBAVCODEC_VERSION_MAJOR < 58)
#define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 59)
#endif
#ifndef FF_API_DEBUG_MV
#define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_AC_VLC
#define FF_API_AC_VLC (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_OLD_MSMPEG4
#define FF_API_OLD_MSMPEG4 (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_ASPECT_EXTENDED
#define FF_API_ASPECT_EXTENDED (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_ARCH_ALPHA
#define FF_API_ARCH_ALPHA (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_XVMC
#define FF_API_XVMC (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_ERROR_RATE
#define FF_API_ERROR_RATE (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_QSCALE_TYPE
#define FF_API_QSCALE_TYPE (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_MB_TYPE
#define FF_API_MB_TYPE (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_MAX_BFRAMES
#define FF_API_MAX_BFRAMES (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_NEG_LINESIZES
#define FF_API_NEG_LINESIZES (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_EMU_EDGE
#define FF_API_EMU_EDGE (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_ARCH_SH4
#define FF_API_ARCH_SH4 (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_ARCH_SPARC
#define FF_API_ARCH_SPARC (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_UNUSED_MEMBERS
#define FF_API_UNUSED_MEMBERS (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_IDCT_XVIDMMX
#define FF_API_IDCT_XVIDMMX (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_INPUT_PRESERVED
#define FF_API_INPUT_PRESERVED (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_NORMALIZE_AQP
#define FF_API_NORMALIZE_AQP (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_GMC
#define FF_API_GMC (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_MV0
#define FF_API_MV0 (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_CODEC_NAME
#define FF_API_CODEC_NAME (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_AFD
#define FF_API_AFD (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_VISMV
/* XXX: don't forget to drop the -vismv documentation */
#define FF_API_VISMV (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_AUDIOENC_DELAY
#define FF_API_AUDIOENC_DELAY (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_VAAPI_CONTEXT
#define FF_API_VAAPI_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_MERGE_SD
#define FF_API_MERGE_SD (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_AVCTX_TIMEBASE
#define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 59)
#endif
#ifndef FF_API_MPV_OPT
#define FF_API_MPV_OPT (LIBAVCODEC_VERSION_MAJOR < 59)
#endif
#ifndef FF_API_STREAM_CODEC_TAG
#define FF_API_STREAM_CODEC_TAG (LIBAVCODEC_VERSION_MAJOR < 59)
#endif
#ifndef FF_API_QUANT_BIAS
#define FF_API_QUANT_BIAS (LIBAVCODEC_VERSION_MAJOR < 59)
#endif
#ifndef FF_API_RC_STRATEGY
#define FF_API_RC_STRATEGY (LIBAVCODEC_VERSION_MAJOR < 59)
#endif
#ifndef FF_API_CODED_FRAME
#define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59)
#endif
#ifndef FF_API_MOTION_EST
#define FF_API_MOTION_EST (LIBAVCODEC_VERSION_MAJOR < 59)
#endif
#ifndef FF_API_WITHOUT_PREFIX
#define FF_API_WITHOUT_PREFIX (LIBAVCODEC_VERSION_MAJOR < 59)
#endif
#ifndef FF_API_SIDEDATA_ONLY_PKT
#define FF_API_SIDEDATA_ONLY_PKT (LIBAVCODEC_VERSION_MAJOR < 59)
#endif

130
ext_includes/libavformat/avformat.h
View File

@ -437,19 +437,6 @@ int av_get_packet(AVIOContext *s, AVPacket *pkt, int size);
*/
int av_append_packet(AVIOContext *s, AVPacket *pkt, int size);
#if FF_API_LAVF_FRAC
/*************************************************/
/* fractional numbers for exact pts handling */
/**
* The exact value of the fractional number is: 'val + num / den'.
* num is assumed to be 0 <= num < den.
*/
typedef struct AVFrac {
int64_t val, num, den;
} AVFrac;
#endif
/*************************************************/
/* input/output formats */
@ -478,10 +465,6 @@ typedef struct AVProbeData {
#define AVFMT_NOFILE 0x0001
#define AVFMT_NEEDNUMBER 0x0002 /**< Needs '%d' in filename. */
#define AVFMT_SHOW_IDS 0x0008 /**< Show format stream IDs numbers. */
#if FF_API_LAVF_FMT_RAWPICTURE
#define AVFMT_RAWPICTURE 0x0020 /**< Format wants AVPicture structure for
raw picture data. @deprecated Not used anymore */
#endif
#define AVFMT_GLOBALHEADER 0x0040 /**< Format wants global header. */
#define AVFMT_NOTIMESTAMPS 0x0080 /**< Format does not need / have any timestamps. */
#define AVFMT_GENERIC_INDEX 0x0100 /**< Use generic index building code. */
@ -894,14 +877,6 @@ typedef struct AVStream {
#endif
void *priv_data;
#if FF_API_LAVF_FRAC
/**
* @deprecated this field is unused
*/
attribute_deprecated
struct AVFrac pts;
#endif
/**
* This is the fundamental unit of time (in seconds) in terms
* of which frame timestamps are represented.
@ -1001,6 +976,34 @@ typedef struct AVStream {
int event_flags;
#define AVSTREAM_EVENT_FLAG_METADATA_UPDATED 0x0001 ///< The call resulted in updated metadata.
/**
* Real base framerate of the stream.
* This is the lowest framerate with which all timestamps can be
* represented accurately (it is the least common multiple of all
* framerates in the stream). Note, this value is just a guess!
* For example, if the time base is 1/90000 and all frames have either
* approximately 3600 or 1800 timer ticks, then r_frame_rate will be 50/1.
*/
AVRational r_frame_rate;
/**
* String containing pairs of key and values describing recommended encoder configuration.
* Pairs are separated by ','.
* Keys are separated from values by '='.
*/
char *recommended_encoder_configuration;
/**
* Codec parameters associated with this stream. Allocated and freed by
* libavformat in avformat_new_stream() and avformat_free_context()
* respectively.
*
* - demuxing: filled by libavformat on stream creation or in
* avformat_find_stream_info()
* - muxing: filled by the caller before avformat_write_header()
*/
AVCodecParameters *codecpar;
/*****************************************************************
* All fields below this line are not part of the public API. They
* may not be used outside of libavformat and can be changed and
@ -1023,6 +1026,7 @@ typedef struct AVStream {
double (*duration_error)[2][MAX_STD_TIMEBASES];
int64_t codec_info_duration;
int64_t codec_info_duration_fields;
int frame_delay_evidence;
/**
* 0 -> decoder has not been searched for yet.
@ -1085,19 +1089,6 @@ typedef struct AVStream {
int nb_index_entries;
unsigned int index_entries_allocated_size;
/**
* Real base framerate of the stream.
* This is the lowest framerate with which all timestamps can be
* represented accurately (it is the least common multiple of all
* framerates in the stream). Note, this value is just a guess!
* For example, if the time base is 1/90000 and all frames have either
* approximately 3600 or 1800 timer ticks, then r_frame_rate will be 50/1.
*
* Code outside avformat should access this field using:
* av_stream_get/set_r_frame_rate(stream)
*/
AVRational r_frame_rate;
/**
* Stream Identifier
* This is the MPEG-TS stream identifier +1
@ -1203,19 +1194,6 @@ typedef struct AVStream {
*/
int inject_global_side_data;
/*****************************************************************
* All fields above this line are not part of the public API.
* Fields below are part of the public API and ABI again.
*****************************************************************
*/
/**
* String containing paris of key and values describing recommended encoder configuration.
* Paris are separated by ','.
* Keys are separated from values by '='.
*/
char *recommended_encoder_configuration;
/**
* display aspect ratio (0 if unknown)
* - encoding: unused
@ -1223,31 +1201,29 @@ typedef struct AVStream {
*/
AVRational display_aspect_ratio;
struct FFFrac *priv_pts;
/**
* An opaque field for libavformat internal usage.
* Must not be accessed in any way by callers.
*/
AVStreamInternal *internal;
/*
* Codec parameters associated with this stream. Allocated and freed by
* libavformat in avformat_new_stream() and avformat_free_context()
* respectively.
*
* - demuxing: filled by libavformat on stream creation or in
* avformat_find_stream_info()
* - muxing: filled by the caller before avformat_write_header()
*/
AVCodecParameters *codecpar;
} AVStream;
#if FF_API_FORMAT_GET_SET
/**
* Accessors for some AVStream fields. These used to be provided for ABI
* compatibility, and do not need to be used anymore.
*/
attribute_deprecated
AVRational av_stream_get_r_frame_rate(const AVStream *s);
attribute_deprecated
void av_stream_set_r_frame_rate(AVStream *s, AVRational r);
struct AVCodecParserContext *av_stream_get_parser(const AVStream *s);
attribute_deprecated
char* av_stream_get_recommended_encoder_configuration(const AVStream *s);
attribute_deprecated
void av_stream_set_recommended_encoder_configuration(AVStream *s, char *configuration);
#endif
struct AVCodecParserContext *av_stream_get_parser(const AVStream *s);
/**
* Returns the pts of the last muxed packet + its duration
@ -1469,7 +1445,7 @@ typedef struct AVFormatContext {
#define AVFMT_FLAG_SORT_DTS 0x10000 ///< try to interleave outputted packets by dts (using this flag can slow demuxing down)
#define AVFMT_FLAG_PRIV_OPT 0x20000 ///< Enable use of private options by delaying codec open (this could be made default once all code is converted)
#if FF_API_LAVF_KEEPSIDE_FLAG
#define AVFMT_FLAG_KEEP_SIDE_DATA 0x40000 ///< Don't merge side data but keep it separate. Deprecated, will be the default.
#define AVFMT_FLAG_KEEP_SIDE_DATA 0x40000 ///< Deprecated, does nothing.
#endif
#define AVFMT_FLAG_FAST_SEEK 0x80000 ///< Enable fast, but inaccurate seeks for some formats
#define AVFMT_FLAG_SHORTEST 0x100000 ///< Stop muxing when the shortest stream stops.
@ -1919,29 +1895,46 @@ typedef struct AVFormatContext {
int max_streams;
} AVFormatContext;
#if FF_API_FORMAT_GET_SET
/**
* Accessors for some AVFormatContext fields. These used to be provided for ABI
* compatibility, and do not need to be used anymore.
*/
attribute_deprecated
int av_format_get_probe_score(const AVFormatContext *s);
attribute_deprecated
AVCodec * av_format_get_video_codec(const AVFormatContext *s);
attribute_deprecated
void av_format_set_video_codec(AVFormatContext *s, AVCodec *c);
attribute_deprecated
AVCodec * av_format_get_audio_codec(const AVFormatContext *s);
attribute_deprecated
void av_format_set_audio_codec(AVFormatContext *s, AVCodec *c);
attribute_deprecated
AVCodec * av_format_get_subtitle_codec(const AVFormatContext *s);
attribute_deprecated
void av_format_set_subtitle_codec(AVFormatContext *s, AVCodec *c);
attribute_deprecated
AVCodec * av_format_get_data_codec(const AVFormatContext *s);
attribute_deprecated
void av_format_set_data_codec(AVFormatContext *s, AVCodec *c);
attribute_deprecated
int av_format_get_metadata_header_padding(const AVFormatContext *s);
attribute_deprecated
void av_format_set_metadata_header_padding(AVFormatContext *s, int c);
attribute_deprecated
void * av_format_get_opaque(const AVFormatContext *s);
attribute_deprecated
void av_format_set_opaque(AVFormatContext *s, void *opaque);
attribute_deprecated
av_format_control_message av_format_get_control_message_cb(const AVFormatContext *s);
attribute_deprecated
void av_format_set_control_message_cb(AVFormatContext *s, av_format_control_message callback);
#if FF_API_OLD_OPEN_CALLBACKS
attribute_deprecated AVOpenCallback av_format_get_open_cb(const AVFormatContext *s);
attribute_deprecated void av_format_set_open_cb(AVFormatContext *s, AVOpenCallback callback);
#endif
#endif
/**
* This function will cause global side data to be injected in the next packet
@ -2103,13 +2096,8 @@ uint8_t *av_stream_new_side_data(AVStream *stream,
* @param size pointer for side information size to store (optional)
* @return pointer to data if present or NULL otherwise
*/
#if FF_API_NOCONST_GET_SIDE_DATA
uint8_t *av_stream_get_side_data(AVStream *stream,
enum AVPacketSideDataType type, int *size);
#else
uint8_t *av_stream_get_side_data(const AVStream *stream,
enum AVPacketSideDataType type, int *size);
#endif
AVProgram *av_new_program(AVFormatContext *s, int id);

9
ext_includes/libavformat/avio.h
View File

@ -452,6 +452,8 @@ void avio_free_directory_entry(AVIODirEntry **entry);
* @param write_flag Set to 1 if the buffer should be writable, 0 otherwise.
* @param opaque An opaque pointer to user-specific data.
* @param read_packet A function for refilling the buffer, may be NULL.
* For stream protocols, must never return 0 but rather
* a proper AVERROR code.
* @param write_packet A function for writing the buffer contents, may be NULL.
* The function may not change the input buffers content.
* @param seek A function for seeking to specified byte position, may be NULL.
@ -569,13 +571,6 @@ int64_t avio_size(AVIOContext *s);
* @return non zero if and only if end of file
*/
int avio_feof(AVIOContext *s);
#if FF_API_URL_FEOF
/**
* @deprecated use avio_feof()
*/
attribute_deprecated
int url_feof(AVIOContext *s);
#endif
/** @warning Writes up to 4 KiB per call */
int avio_printf(AVIOContext *s, const char *fmt, ...) av_printf_format(2, 3);

45
ext_includes/libavformat/version.h
View File

@ -31,8 +31,8 @@
// Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)
// Also please add any ticket numbers that you believe might be affected here
#define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MINOR 84
#define LIBAVFORMAT_VERSION_MAJOR 58
#define LIBAVFORMAT_VERSION_MINOR 2
#define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
@ -55,47 +55,32 @@
* at once through the bump. This improves the git bisect-ability of the change.
*
*/
#ifndef FF_API_LAVF_BITEXACT
#define FF_API_LAVF_BITEXACT (LIBAVFORMAT_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_LAVF_FRAC
#define FF_API_LAVF_FRAC (LIBAVFORMAT_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_LAVF_CODEC_TB
#define FF_API_LAVF_CODEC_TB (LIBAVFORMAT_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_URL_FEOF
#define FF_API_URL_FEOF (LIBAVFORMAT_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_LAVF_FMT_RAWPICTURE
#define FF_API_LAVF_FMT_RAWPICTURE (LIBAVFORMAT_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_COMPUTE_PKT_FIELDS2
#define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 58)
#define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif
#ifndef FF_API_OLD_OPEN_CALLBACKS
#define FF_API_OLD_OPEN_CALLBACKS (LIBAVFORMAT_VERSION_MAJOR < 58)
#define FF_API_OLD_OPEN_CALLBACKS (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif
#ifndef FF_API_LAVF_AVCTX
#define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_NOCONST_GET_SIDE_DATA
#define FF_API_NOCONST_GET_SIDE_DATA (LIBAVFORMAT_VERSION_MAJOR < 58)
#define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif
#ifndef FF_API_HTTP_USER_AGENT
#define FF_API_HTTP_USER_AGENT (LIBAVFORMAT_VERSION_MAJOR < 58)
#define FF_API_HTTP_USER_AGENT (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif
#ifndef FF_API_HLS_WRAP
#define FF_API_HLS_WRAP (LIBAVFORMAT_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_LAVF_MERGE_SD
#define FF_API_LAVF_MERGE_SD (LIBAVFORMAT_VERSION_MAJOR < 58)
#define FF_API_HLS_WRAP (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif
#ifndef FF_API_LAVF_KEEPSIDE_FLAG
#define FF_API_LAVF_KEEPSIDE_FLAG (LIBAVFORMAT_VERSION_MAJOR < 58)
#define FF_API_LAVF_KEEPSIDE_FLAG (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif
#ifndef FF_API_OLD_ROTATE_API
#define FF_API_OLD_ROTATE_API (LIBAVFORMAT_VERSION_MAJOR < 58)
#define FF_API_OLD_ROTATE_API (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif
#ifndef FF_API_FORMAT_GET_SET
#define FF_API_FORMAT_GET_SET (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif
#ifndef FF_API_OLD_AVIO_EOF_0
#define FF_API_OLD_AVIO_EOF_0 (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif

14
ext_includes/libavutil/attributes.h
View File

@ -66,19 +66,19 @@
# define av_noinline
#endif
#if AV_GCC_VERSION_AT_LEAST(3,1)
#if AV_GCC_VERSION_AT_LEAST(3,1) || defined(__clang__)
# define av_pure __attribute__((pure))
#else
# define av_pure
#endif
#if AV_GCC_VERSION_AT_LEAST(2,6)
#if AV_GCC_VERSION_AT_LEAST(2,6) || defined(__clang__)
# define av_const __attribute__((const))
#else
# define av_const
#endif
#if AV_GCC_VERSION_AT_LEAST(4,3)
#if AV_GCC_VERSION_AT_LEAST(4,3) || defined(__clang__)
# define av_cold __attribute__((cold))
#else
# define av_cold
@ -138,19 +138,19 @@
# define av_used
#endif
#if AV_GCC_VERSION_AT_LEAST(3,3)
#if AV_GCC_VERSION_AT_LEAST(3,3) || defined(__clang__)
# define av_alias __attribute__((may_alias))
#else
# define av_alias
#endif
#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(__clang__)
#if (defined(__GNUC__) || defined(__clang__)) && !defined(__INTEL_COMPILER)
# define av_uninit(x) x=x
#else
# define av_uninit(x) x
#endif
#ifdef __GNUC__
#if defined(__GNUC__) || defined(__clang__)
# define av_builtin_constant_p __builtin_constant_p
# define av_printf_format(fmtpos, attrpos) __attribute__((__format__(__printf__, fmtpos, attrpos)))
#else
@ -158,7 +158,7 @@
# define av_printf_format(fmtpos, attrpos)
#endif
#if AV_GCC_VERSION_AT_LEAST(2,5)
#if AV_GCC_VERSION_AT_LEAST(2,5) || defined(__clang__)
# define av_noreturn __attribute__((noreturn))
#else
# define av_noreturn

4
ext_includes/libavutil/crc.h
View File

@ -53,11 +53,7 @@ typedef enum {
AV_CRC_32_IEEE,
AV_CRC_32_IEEE_LE, /*< reversed bitorder version of AV_CRC_32_IEEE */
AV_CRC_16_ANSI_LE, /*< reversed bitorder version of AV_CRC_16_ANSI */
#if FF_API_CRC_BIG_TABLE
AV_CRC_24_IEEE = 12,
#else
AV_CRC_24_IEEE,
#endif /* FF_API_CRC_BIG_TABLE */
AV_CRC_MAX, /*< Not part of public API! Do not use outside libavutil. */
}AVCRCId;

2
ext_includes/libavutil/ffversion.h
View File

@ -1,5 +1,5 @@
/* Automatically generated by version.sh, do not manually edit! */
#ifndef AVUTIL_FFVERSION_H
#define AVUTIL_FFVERSION_H
#define FFMPEG_VERSION "N-87863-g4b6f1d2a6c"
#define FFMPEG_VERSION "N-88940-g6430f8505e"
#endif /* AVUTIL_FFVERSION_H */

40
ext_includes/libavutil/frame.h
View File

@ -563,39 +563,77 @@ typedef struct AVFrame {
/**
* @}
*/
/**
* AVBufferRef for internal use by a single libav* library.
* Must not be used to transfer data between libraries.
* Has to be NULL when ownership of the frame leaves the respective library.
*
* Code outside the FFmpeg libs should never check or change the contents of the buffer ref.
*
* FFmpeg calls av_buffer_unref() on it when the frame is unreferenced.
* av_frame_copy_props() calls create a new reference with av_buffer_ref()
* for the target frame's private_ref field.
*/
AVBufferRef *private_ref;
} AVFrame;
#if FF_API_FRAME_GET_SET
/**
* Accessors for some AVFrame fields. These used to be provided for ABI
* compatibility, and do not need to be used anymore.
*/
attribute_deprecated
int64_t av_frame_get_best_effort_timestamp(const AVFrame *frame);
attribute_deprecated
void av_frame_set_best_effort_timestamp(AVFrame *frame, int64_t val);
attribute_deprecated
int64_t av_frame_get_pkt_duration (const AVFrame *frame);
attribute_deprecated
void av_frame_set_pkt_duration (AVFrame *frame, int64_t val);
attribute_deprecated
int64_t av_frame_get_pkt_pos (const AVFrame *frame);
attribute_deprecated
void av_frame_set_pkt_pos (AVFrame *frame, int64_t val);
attribute_deprecated
int64_t av_frame_get_channel_layout (const AVFrame *frame);
attribute_deprecated
void av_frame_set_channel_layout (AVFrame *frame, int64_t val);
attribute_deprecated
int av_frame_get_channels (const AVFrame *frame);
attribute_deprecated
void av_frame_set_channels (AVFrame *frame, int val);
attribute_deprecated
int av_frame_get_sample_rate (const AVFrame *frame);
attribute_deprecated
void av_frame_set_sample_rate (AVFrame *frame, int val);
attribute_deprecated
AVDictionary *av_frame_get_metadata (const AVFrame *frame);
attribute_deprecated
void av_frame_set_metadata (AVFrame *frame, AVDictionary *val);
attribute_deprecated
int av_frame_get_decode_error_flags (const AVFrame *frame);
attribute_deprecated
void av_frame_set_decode_error_flags (AVFrame *frame, int val);
attribute_deprecated
int av_frame_get_pkt_size(const AVFrame *frame);
attribute_deprecated
void av_frame_set_pkt_size(AVFrame *frame, int val);
AVDictionary **avpriv_frame_get_metadatap(AVFrame *frame);
#if FF_API_FRAME_QP
attribute_deprecated
int8_t *av_frame_get_qp_table(AVFrame *f, int *stride, int *type);
attribute_deprecated
int av_frame_set_qp_table(AVFrame *f, AVBufferRef *buf, int stride, int type);
#endif
attribute_deprecated
enum AVColorSpace av_frame_get_colorspace(const AVFrame *frame);
attribute_deprecated
void av_frame_set_colorspace(AVFrame *frame, enum AVColorSpace val);
attribute_deprecated
enum AVColorRange av_frame_get_color_range(const AVFrame *frame);
attribute_deprecated
void av_frame_set_color_range(AVFrame *frame, enum AVColorRange val);
#endif
/**
* Get the name of a colorspace.

2
ext_includes/libavutil/hmac.h
View File

@ -35,7 +35,7 @@ enum AVHMACType {
AV_HMAC_SHA1,
AV_HMAC_SHA224,
AV_HMAC_SHA256,
AV_HMAC_SHA384 = 12,
AV_HMAC_SHA384,
AV_HMAC_SHA512,
};

2
ext_includes/libavutil/hwcontext.h
View File

@ -25,13 +25,13 @@
#include "pixfmt.h"
enum AVHWDeviceType {
AV_HWDEVICE_TYPE_NONE,
AV_HWDEVICE_TYPE_VDPAU,
AV_HWDEVICE_TYPE_CUDA,
AV_HWDEVICE_TYPE_VAAPI,
AV_HWDEVICE_TYPE_DXVA2,
AV_HWDEVICE_TYPE_QSV,
AV_HWDEVICE_TYPE_VIDEOTOOLBOX,
AV_HWDEVICE_TYPE_NONE,
AV_HWDEVICE_TYPE_D3D11VA,
AV_HWDEVICE_TYPE_DRM,
};

7
ext_includes/libavutil/intreadwrite.h
View File

@ -215,7 +215,7 @@ typedef union {
* by per-arch headers.
*/
#if defined(__GNUC__) && !defined(__TI_COMPILER_VERSION__)
#if defined(__GNUC__)
union unaligned_64 { uint64_t l; } __attribute__((packed)) av_alias;
union unaligned_32 { uint32_t l; } __attribute__((packed)) av_alias;
@ -224,11 +224,6 @@ union unaligned_16 { uint16_t l; } __attribute__((packed)) av_alias;
# define AV_RN(s, p) (((const union unaligned_##s *) (p))->l)
# define AV_WN(s, p, v) ((((union unaligned_##s *) (p))->l) = (v))
#elif defined(__DECC)
# define AV_RN(s, p) (*((const __unaligned uint##s##_t*)(p)))
# define AV_WN(s, p, v) (*((__unaligned uint##s##_t*)(p)) = (v))
#elif defined(_MSC_VER) && (defined(_M_ARM) || defined(_M_X64)) && AV_HAVE_FAST_UNALIGNED
# define AV_RN(s, p) (*((const __unaligned uint##s##_t*)(p)))

14
ext_includes/libavutil/log.h
View File

@ -334,20 +334,6 @@ void av_log_format_line(void *ptr, int level, const char *fmt, va_list vl,
int av_log_format_line2(void *ptr, int level, const char *fmt, va_list vl,
char *line, int line_size, int *print_prefix);
#if FF_API_DLOG
/**
* av_dlog macros
* @deprecated unused
* Useful to print debug messages that shouldn't get compiled in normally.
*/
#ifdef DEBUG
# define av_dlog(pctx, ...) av_log(pctx, AV_LOG_DEBUG, __VA_ARGS__)
#else
# define av_dlog(pctx, ...) do { if (0) av_log(pctx, AV_LOG_DEBUG, __VA_ARGS__); } while (0)
#endif
#endif /* FF_API_DLOG */
/**
* Skip repeated messages, this requires the user app to use av_log() instead of
* (f)printf as the 2 would otherwise interfere and lead to

21
ext_includes/libavutil/mem.h
View File

@ -90,13 +90,6 @@
#if defined(__INTEL_COMPILER) && __INTEL_COMPILER < 1110 || defined(__SUNPRO_C)
#define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v
#define DECLARE_ASM_CONST(n,t,v) const t __attribute__ ((aligned (n))) v
#elif defined(__TI_COMPILER_VERSION__)
#define DECLARE_ALIGNED(n,t,v) \
AV_PRAGMA(DATA_ALIGN(v,n)) \
t __attribute__((aligned(n))) v
#define DECLARE_ASM_CONST(n,t,v) \
AV_PRAGMA(DATA_ALIGN(v,n)) \
static const t __attribute__((aligned(n))) v
#elif defined(__DJGPP__)
#define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (FFMIN(n, 16)))) v
#define DECLARE_ASM_CONST(n,t,v) static const t av_used __attribute__ ((aligned (FFMIN(n, 16)))) v
@ -206,12 +199,7 @@ void *av_mallocz(size_t size) av_malloc_attrib av_alloc_size(1);
* be allocated
* @see av_malloc()
*/
av_alloc_size(1, 2) static inline void *av_malloc_array(size_t nmemb, size_t size)
{
if (!size || nmemb >= INT_MAX / size)
return NULL;
return av_malloc(nmemb * size);
}
av_alloc_size(1, 2) void *av_malloc_array(size_t nmemb, size_t size);
/**
* Allocate a memory block for an array with av_mallocz().
@ -226,12 +214,7 @@ av_alloc_size(1, 2) static inline void *av_malloc_array(size_t nmemb, size_t siz
* @see av_mallocz()
* @see av_malloc_array()
*/
av_alloc_size(1, 2) static inline void *av_mallocz_array(size_t nmemb, size_t size)
{
if (!size || nmemb >= INT_MAX / size)
return NULL;
return av_mallocz(nmemb * size);
}
av_alloc_size(1, 2) void *av_mallocz_array(size_t nmemb, size_t size);
/**
* Non-inlined equivalent of av_mallocz_array().

3
ext_includes/libavutil/opt.h
View File

@ -275,9 +275,6 @@ typedef struct AVOption {
int flags;
#define AV_OPT_FLAG_ENCODING_PARAM 1 ///< a generic parameter which can be set by the user for muxing or encoding
#define AV_OPT_FLAG_DECODING_PARAM 2 ///< a generic parameter which can be set by the user for demuxing or decoding
#if FF_API_OPT_TYPE_METADATA
#define AV_OPT_FLAG_METADATA 4 ///< some data extracted or inserted into the file like title, comment, ...
#endif
#define AV_OPT_FLAG_AUDIO_PARAM 8
#define AV_OPT_FLAG_VIDEO_PARAM 16
#define AV_OPT_FLAG_SUBTITLE_PARAM 32

5
ext_includes/libavutil/pixdesc.h
View File

@ -229,11 +229,6 @@ enum AVPixelFormat av_pix_fmt_desc_get_id(const AVPixFmtDescriptor *desc);
* Utility function to access log2_chroma_w log2_chroma_h from
* the pixel format AVPixFmtDescriptor.
*
* See av_get_chroma_sub_sample() for a function that asserts a
* valid pixel format instead of returning an error code.
* Its recommended that you use avcodec_get_chroma_sub_sample unless
* you do check the return code!
*
* @param[in] pix_fmt the pixel format
* @param[out] h_shift store log2_chroma_w (horizontal/width shift)
* @param[out] v_shift store log2_chroma_h (vertical/height shift)

22
ext_includes/libavutil/pixfmt.h
View File

@ -74,11 +74,6 @@ enum AVPixelFormat {
AV_PIX_FMT_YUVJ420P, ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV420P and setting color_range
AV_PIX_FMT_YUVJ422P, ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV422P and setting color_range
AV_PIX_FMT_YUVJ444P, ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV444P and setting color_range
#if FF_API_XVMC
AV_PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
AV_PIX_FMT_XVMC_MPEG2_IDCT,
AV_PIX_FMT_XVMC = AV_PIX_FMT_XVMC_MPEG2_IDCT,
#endif /* FF_API_XVMC */
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)
@ -100,13 +95,6 @@ enum AVPixelFormat {
AV_PIX_FMT_YUV440P, ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
AV_PIX_FMT_YUVJ440P, ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV440P and setting color_range
AV_PIX_FMT_YUVA420P, ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
#if FF_API_VDPAU
AV_PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
AV_PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
AV_PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
AV_PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
AV_PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
#endif
AV_PIX_FMT_RGB48BE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian
AV_PIX_FMT_RGB48LE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian
@ -142,9 +130,6 @@ enum AVPixelFormat {
AV_PIX_FMT_YUV422P16BE, ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
AV_PIX_FMT_YUV444P16LE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
AV_PIX_FMT_YUV444P16BE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
#if FF_API_VDPAU
AV_PIX_FMT_VDPAU_MPEG4, ///< MPEG-4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
#endif
AV_PIX_FMT_DXVA2_VLD, ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer
AV_PIX_FMT_RGB444LE, ///< packed RGB 4:4:4, 16bpp, (msb)4X 4R 4G 4B(lsb), little-endian, X=unused/undefined
@ -176,7 +161,6 @@ enum AVPixelFormat {
AV_PIX_FMT_YUV444P10LE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
AV_PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
AV_PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
AV_PIX_FMT_VDA_VLD, ///< hardware decoding through VDA
AV_PIX_FMT_GBRP, ///< planar GBR 4:4:4 24bpp
AV_PIX_FMT_GBR24P = AV_PIX_FMT_GBRP, // alias for #AV_PIX_FMT_GBRP
AV_PIX_FMT_GBRP9BE, ///< planar GBR 4:4:4 27bpp, big-endian
@ -221,8 +205,6 @@ enum AVPixelFormat {
AV_PIX_FMT_YVYU422, ///< packed YUV 4:2:2, 16bpp, Y0 Cr Y1 Cb
AV_PIX_FMT_VDA, ///< HW acceleration through VDA, data[3] contains a CVPixelBufferRef
AV_PIX_FMT_YA16BE, ///< 16 bits gray, 16 bits alpha (big-endian)
AV_PIX_FMT_YA16LE, ///< 16 bits gray, 16 bits alpha (little-endian)
@ -283,9 +265,9 @@ enum AVPixelFormat {
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 */
#if !FF_API_XVMC
AV_PIX_FMT_XVMC,///< XVideo Motion Acceleration via common packet passing
#endif /* !FF_API_XVMC */
AV_PIX_FMT_YUV440P10LE, ///< planar YUV 4:4:0,20bpp, (1 Cr & Cb sample per 1x2 Y samples), little-endian
AV_PIX_FMT_YUV440P10BE, ///< planar YUV 4:4:0,20bpp, (1 Cr & Cb sample per 1x2 Y samples), big-endian
AV_PIX_FMT_YUV440P12LE, ///< planar YUV 4:4:0,24bpp, (1 Cr & Cb sample per 1x2 Y samples), little-endian

34
ext_includes/libavutil/version.h
View File

@ -79,8 +79,8 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 55
#define LIBAVUTIL_VERSION_MINOR 79
#define LIBAVUTIL_VERSION_MAJOR 56
#define LIBAVUTIL_VERSION_MINOR 0
#define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
@ -106,38 +106,26 @@
* @{
*/
#ifndef FF_API_VDPAU
#define FF_API_VDPAU (LIBAVUTIL_VERSION_MAJOR < 56)
#endif
#ifndef FF_API_XVMC
#define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 56)
#endif
#ifndef FF_API_OPT_TYPE_METADATA
#define FF_API_OPT_TYPE_METADATA (LIBAVUTIL_VERSION_MAJOR < 56)
#endif
#ifndef FF_API_DLOG
#define FF_API_DLOG (LIBAVUTIL_VERSION_MAJOR < 56)
#endif
#ifndef FF_API_VAAPI
#define FF_API_VAAPI (LIBAVUTIL_VERSION_MAJOR < 56)
#define FF_API_VAAPI (LIBAVUTIL_VERSION_MAJOR < 57)
#endif
#ifndef FF_API_FRAME_QP
#define FF_API_FRAME_QP (LIBAVUTIL_VERSION_MAJOR < 56)
#define FF_API_FRAME_QP (LIBAVUTIL_VERSION_MAJOR < 57)
#endif
#ifndef FF_API_PLUS1_MINUS1
#define FF_API_PLUS1_MINUS1 (LIBAVUTIL_VERSION_MAJOR < 56)
#define FF_API_PLUS1_MINUS1 (LIBAVUTIL_VERSION_MAJOR < 57)
#endif
#ifndef FF_API_ERROR_FRAME
#define FF_API_ERROR_FRAME (LIBAVUTIL_VERSION_MAJOR < 56)
#endif
#ifndef FF_API_CRC_BIG_TABLE
#define FF_API_CRC_BIG_TABLE (LIBAVUTIL_VERSION_MAJOR < 56)
#define FF_API_ERROR_FRAME (LIBAVUTIL_VERSION_MAJOR < 57)
#endif
#ifndef FF_API_PKT_PTS
#define FF_API_PKT_PTS (LIBAVUTIL_VERSION_MAJOR < 56)
#define FF_API_PKT_PTS (LIBAVUTIL_VERSION_MAJOR < 57)
#endif
#ifndef FF_API_CRYPTO_SIZE_T
#define FF_API_CRYPTO_SIZE_T (LIBAVUTIL_VERSION_MAJOR < 56)
#define FF_API_CRYPTO_SIZE_T (LIBAVUTIL_VERSION_MAJOR < 57)
#endif
#ifndef FF_API_FRAME_GET_SET
#define FF_API_FRAME_GET_SET (LIBAVUTIL_VERSION_MAJOR < 57)
#endif

6
ext_includes/libswresample/version.h
View File

@ -28,9 +28,9 @@
#include "libavutil/avutil.h"
#define LIBSWRESAMPLE_VERSION_MAJOR 2
#define LIBSWRESAMPLE_VERSION_MINOR 10
#define LIBSWRESAMPLE_VERSION_MICRO 100
#define LIBSWRESAMPLE_VERSION_MAJOR 3
#define LIBSWRESAMPLE_VERSION_MINOR 0
#define LIBSWRESAMPLE_VERSION_MICRO 101
#define LIBSWRESAMPLE_VERSION_INT AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \
LIBSWRESAMPLE_VERSION_MINOR, \

17
ext_libs/avcodec-vgmstream-57.dll.asc
View File

@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAABCAAGBQJZ4qGHAAoJEI1smEefSt5xCv4QAIoP2CJMW/vWD64ZGpRYQ0fm
8mxN7wyAwLbsWt03CK7RM4g9t9T+RfF1SIFVJkCOiZX8M9S2EFpEBwq8Td54CCTn
SeQeCP6KdLiZj/gk3pJU6dFsDDhF74IJHRoYEcWCun5E6vjRlHoOJh2NbUEH5kf/
w+EKMqdYN8UKcWi0nDsS4hTA8NZaxeXmK2EDtx/rjMk0vK3ecuEh4M0cpXgxoCcj
/Q8RgQCUJyOZeT0PnjEjYOSohnYl401Tg3XrbsyIDUs2IVCC1LG93GEH1yQdqE/F
6wjhcF2iD1B1L3U0abNw0PJAOlNKimbEspPpFXFifGrH8ssi0k2cVyGC/M5+nK1f
bUhSdlcADYb4r5B6hYNNbS6C2BMAN58TYhRlez5g027iEOy89zGnLHGLEo+RzSma
2ygEJD68NVIYoVYr+Gjprjq5IOfEogv5jhN5yIuC6B5ze1cxzOkW9L0eO8Sp8Gxp
9ohQSQdcyAtbzSuB1RB8XZzEDcFRDxodmkiU4P1heHxT59AVqyvMe/Zc0JJvV82a
bJ90bwpV6WCOS3q4zunpTXH7f5dmnfI7R4uT+o1DybBHCAdIYaBgvlsL1YJU08eh
TQDPnTgeyaKhuLVpXGl06go7mzHlC5G/E/7PpoAKWdJlewmNuKQ6Y4cRxWJqFWbz
x1e7cE195yr3I6PRy3rU
=sgGw
-----END PGP SIGNATURE-----

39
ext_libs/avcodec-vgmstream-57.def → ext_libs/avcodec-vgmstream-58.def
View File

@ -1,10 +1,6 @@
EXPORTS
audio_resample
audio_resample_close
av_audio_convert
av_audio_convert_alloc
av_audio_convert_free
av_audio_resample_init
av_ac3_parse_header
av_adts_header_parse
av_bitstream_filter_close
av_bitstream_filter_filter
av_bitstream_filter_init
@ -24,7 +20,7 @@ EXPORTS
av_bsf_next
av_bsf_receive_packet
av_bsf_send_packet
av_codec_ffversion DATA
av_codec_ffversion
av_codec_get_chroma_intra_matrix
av_codec_get_codec_descriptor
av_codec_get_codec_properties
@ -74,8 +70,6 @@ EXPORTS
av_jni_get_java_vm
av_jni_set_java_vm
av_lockmgr_register
av_log_ask_for_sample
av_log_missing_feature
av_mdct_calc
av_mdct_end
av_mdct_init
@ -118,10 +112,6 @@ EXPORTS
av_register_bitstream_filter
av_register_codec_parser
av_register_hwaccel
av_resample
av_resample_close
av_resample_compensate
av_resample_init
av_shrink_packet
av_vorbis_parse_frame
av_vorbis_parse_frame_flags
@ -154,9 +144,9 @@ EXPORTS
avcodec_encode_video2
avcodec_enum_to_chroma_pos
avcodec_fill_audio_frame
avcodec_find_best_pix_fmt2
avcodec_find_best_pix_fmt_of_2
avcodec_find_best_pix_fmt_of_list
avcodec_find_best_pix_fmt2
avcodec_find_decoder
avcodec_find_decoder_by_name
avcodec_find_encoder
@ -166,8 +156,8 @@ EXPORTS
avcodec_get_chroma_sub_sample
avcodec_get_class
avcodec_get_context_defaults3
avcodec_get_edge_width
avcodec_get_frame_class
avcodec_get_hw_frames_parameters
avcodec_get_name
avcodec_get_pix_fmt_loss
avcodec_get_subtitle_rect_class
@ -188,7 +178,6 @@ EXPORTS
avcodec_register_all
avcodec_send_frame
avcodec_send_packet
avcodec_set_dimensions
avcodec_string
avcodec_version
avpicture_alloc
@ -196,30 +185,26 @@ EXPORTS
avpicture_free
avpicture_get_size
avpicture_layout
avpriv_aac_parse_header
avpriv_ac3_channel_layout_tab DATA
avpriv_ac3_channel_layout_tab
avpriv_ac3_parse_header
avpriv_align_put_bits
avpriv_bprint_to_extradata
avpriv_codec_get_cap_skip_frame_fill_param
avpriv_copy_bits
avpriv_copy_pce_data
avpriv_dca_convert_bitstream
avpriv_dca_parse_core_frame_header
avpriv_dca_sample_rates DATA
avpriv_dca_sample_rates
avpriv_find_pix_fmt
avpriv_find_start_code
avpriv_get_raw_pix_fmt_tags
avpriv_lock_avformat
avpriv_mpa_bitrate_tab DATA
avpriv_mpa_decode_header
avpriv_mpa_decode_header2
avpriv_mpa_freq_tab DATA
avpriv_mpa_bitrate_tab
avpriv_mpa_freq_tab
avpriv_mpeg4audio_get_config
avpriv_mpeg4audio_sample_rates DATA
avpriv_mpeg4audio_sample_rates
avpriv_mpegaudio_decode_header
avpriv_pix_fmt_bps_avi DATA
avpriv_pix_fmt_bps_mov DATA
avpriv_pix_fmt_bps_avi
avpriv_pix_fmt_bps_mov
avpriv_put_string
avpriv_split_xiph_headers
avpriv_tak_parse_streaminfo

BIN
ext_libs/avcodec-vgmstream-57.dll → ext_libs/avcodec-vgmstream-58.dll
View File

Binary file not shown.

17
ext_libs/avcodec-vgmstream-58.dll.asc Normal file
View File

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAABCAAGBQJaB8iLAAoJEI1smEefSt5xUa8P/AucdTroPK9Xftr5A2EOSBiY
73OZkzNe6204MZ4T3Res67miTBWc/B37XSGYFUCCdYAsEWVJ6TiO60iYzCiwa2K8
3P6hWIL405kO7qbl3qvsjPOrrU6Lxz3QjvYbBtMcCyZM28Vry6Hl7qkXHEPKPwVx
3yFGpRHkbBdXAIexHp/HnLJ7u95BUlJo5WuPGqr4xUUa5IJPY2et7HrrX2YIfq/+
qZ/Oj5aBiNyZAxoeCYOlGsavtq1UiJaPr9zc0W+D0/h63lf+2ivIkfDsqjb1AFyC
XtT7D0nPBIjUvAFQkNW3YIb8LmlGtMXGgfQ6cBmX5y0OuMqf1v83PbYiTuSQAaNy
DQyJNi4SoskSPJEcjnI5r/H0krxxZyAyESFChl/kiwpyVAfclIhPPUB2Gk0CHcS9
MMilSWlFP/tJR4jVyW2NgyfzWYlsLokFr85iqvZ3BEzcDBZTm+nQreScw1Uz0Azh
o/tHuCsUIQSPmWm0AGdC4IWNfpAzENuuyOp953itYXqfOHM06zSQHaXg4y7pHyrR
Kbu4lTqcAmP/5sJI2k2y0GBFxnqqISHkxlri9fNgHy0QufggA1YjDQRtn52IRsaB
CkzGlThhMIgndrGhaGSRT8gapvrPyPZCHDGsiFKrNQM+BT2iw/sH2JECohiF9Q1o
uIlwVwrMfce9xZF8MZhF
=U4IV
-----END PGP SIGNATURE-----

BIN
ext_libs/avformat-vgmstream-57.dll
View File

Binary file not shown.

17
ext_libs/avformat-vgmstream-57.dll.asc
View File

@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAABCAAGBQJZ4qGIAAoJEI1smEefSt5xelQP/0r08Ia06MClhd41w7+NKqSS
mLoa4KZ51D8cunZSp/OLc8BxqWkAYEM+D1K9kJ8c52534RN3dAOxO33yBGlz4CP1
g67dR0cMw77CgFlInajJfURa0eVk3qDeg+bVITwNsejBdlN1GObzv90yikOMbYbn
YwgUZ/PYSPi9q+5QxziSoQXnXMS3uDmhm1MSikLfh0O1XVGAiuaUTgcHImltbpmg
SmiKmvAMdVdDC/ExUEfk1tXMLzyxo+CLVWbxAcehbN6ZxoPSw9L5A3PxLwJ0RJe/
H4GqJmT+G5TqdEDDhlROL0MjG6MKQ6T5RoUycCuKWvW7aRNUa6FrSPLrl6Y9DxiD
4+p7nnd6UFu1mHcKaIgLXR/zXZoufPuTekWbSaNswJx0gFNx4eTEhCJWs2s47Tnw
lXge6y4kq9P5SEkEjt1w162CeqGp+Cg2a7hJO0tPFyieA8XOYJFFtOcXJVlcp+sa
RtGhAJsGyGBvpnQyoiKeVG+Cb5iIeDvpkzEwIIxL8lFMOu+5pK3yBvdE7HX+KLu9
5hNeL6ii4EWQdhazECDgjrkiDBSVIiUDJQw5Nm3yE/2K/LTunUiNygnX+UUyzhWr
M6WijaXV7D+CbNt3OsPY5KodeFZWBUWYSZUzLmW8OLMXgYer0M/MqGWSYbocixrc
izUEJLaxO5QqyedpV0rp
=Kx+V
-----END PGP SIGNATURE-----

10
ext_libs/avformat-vgmstream-57.def → ext_libs/avformat-vgmstream-58.def
View File

@ -5,7 +5,6 @@ EXPORTS
av_codec_get_id
av_codec_get_tag
av_codec_get_tag2
av_convert_lang_to
av_demuxer_open
av_dump_format
av_filename_number_test
@ -14,7 +13,7 @@ EXPORTS
av_find_input_format
av_find_program_from_stream
av_fmt_ctx_get_duration_estimation_method
av_format_ffversion DATA
av_format_ffversion
av_format_get_audio_codec
av_format_get_control_message_cb
av_format_get_data_codec
@ -50,8 +49,8 @@ EXPORTS
av_match_ext
av_new_program
av_oformat_next
av_pkt_dump2
av_pkt_dump_log2
av_pkt_dump2
av_probe_input_buffer
av_probe_input_buffer2
av_probe_input_format
@ -125,9 +124,9 @@ EXPORTS
avio_get_str16le
avio_handshake
avio_open
avio_open2
avio_open_dir
avio_open_dyn_buf
avio_open2
avio_pause
avio_printf
avio_put_str
@ -168,6 +167,7 @@ EXPORTS
ffio_open_dyn_packet_buf
ffio_set_buf_size
ffurl_close
ffurl_closep
ffurl_open
ffurl_open_whitelist
ffurl_write
url_feof

BIN
ext_libs/avformat-vgmstream-58.dll Normal file
View File

Binary file not shown.

17
ext_libs/avformat-vgmstream-58.dll.asc Normal file
View File

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAABCAAGBQJaB8iLAAoJEI1smEefSt5xjJMP/2q6EAXK383tOF9cfYPfg196
Nai5Ypw0uLONqkY3JPk9aBB+QAjv/G+tAhygaLEnCMWy6du0M1HM+1QAw7R4le/S
mT5FCMHjTckdY4LAcpv3QqobiYNgBpTEJw3NYbXciLkl3EjoyhNncW7JBKX8nbbz
qQPAilAQTBH1Wf7+4O+5nt6JDau3oGX2M5gUMdG2/I1qaqfwgBy1S9vWp0dbBtxf
I5Ck23mfsEsTpP7eppEciKO8r0GokVhUiTKxj260ZYRY/embb/Y84u9gJ+z+Y9mU
2YOt3sJNSc77OLP9Ed1WagsC/1q9DbUa1JZ+UEPEX1I3kar7lAeDX2i5aYowF+4o
JNfTot+2UcK/9TcK4AXBZwQMbppa9f3fWwTFsekcPJRdfZYIVpmFLSePA7Dz1yaP
zL4owZLyErMPRMBPL3aAQB4ZDs8/1RHjizoQ8vGGUc0ZyF6rZQNzcBoG7Uqx2mHx
Ues0s53t+lpn+Orub8b+gGiGgiwcplioOrxRl1qMMtCMFXBUZd6VKshC0WQAVutp
QCMrhboKa6/SFYJTlyhzNEaoSGEgFIx62sEOlH5UfoRGHaTtsUbq9hGXVya+8os9
DnCb68tsbJ8701jARG2SwBzWXzjpy8qgcVoGSDpO4aDj51Ke+/N8pbN43ASIDAxo
4UyHLZBlA6dPol88+RTa
=nhmM
-----END PGP SIGNATURE-----

17
ext_libs/avutil-vgmstream-55.dll.asc
View File

@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAABCAAGBQJZ4qGIAAoJEI1smEefSt5xp8cP/10cqSHQw0aLTfMz382HrgB6
TEuOcc9YttOH4qFxX2q7D/eCRjMyusMU0Q3kCXpvsH1I4nPAd//Cg2ExLZbvKEpK
L2aSD4prspGVrHpFPuECsiAG2g01AibFJJnXKzq5m/jXW8cj+DWkdYDvgSQCbfMm
hhHoKJHTvRQQlIdlcD9Amk07Uez17KT0yzukspfWYuhJ58ZWb/V9sWxKW4J8AVtx
s02Kvy1fowBvXJmtfmPZ1Tjq00c9dT75VIug6Mq8CkRJ1ShY44WXpe0cCKd4ScSC
lOxvwAR0ox/Jmxr+dGee83XrvINFPH0Pl918EyXzs+CgJb11di5ZR5vURK/sbLnV
idisdmh17xLXPpsvz6kmiYhb1xk3pYQ9XKKob13SO/I3ktoHgFjpbtUwJkPralL5
x0DeN3zL6aIYPcEeO3eVvEV01iyVjEIh3ex0j0a7bO8ecO+U7Mw7LG5KD6jFdU5Q
FAJYOk8HKaL9llUEztjN/DagBLQbizDvqumHd5C2sukerWe7hVDBJagL/jE1F3Vm
5MWV1iZALknxdPPxaNpiKIx38jRUp+v5Lkfjxdy1QxC4DNk6s31NWhaMVHOICsfD
CyMDZ9YM5CZR81jutCjaZZaWe08bvIFnykVN6tQo1xBAdxRtG7PpI9+oXMkFam7A
BaIQoYsDEEGM3TIbWtrN
=S0oT
-----END PGP SIGNATURE-----

49
ext_libs/avutil-vgmstream-55.def → ext_libs/avutil-vgmstream-56.def
View File

@ -14,7 +14,7 @@ EXPORTS
av_aes_ctr_set_iv
av_aes_ctr_set_random_iv
av_aes_init
av_aes_size DATA
av_aes_size
av_append_path_component
av_asprintf
av_assert0_fpu
@ -67,12 +67,12 @@ EXPORTS
av_camellia_alloc
av_camellia_crypt
av_camellia_init
av_camellia_size DATA
av_camellia_size
av_cast5_alloc
av_cast5_crypt
av_cast5_crypt2
av_cast5_init
av_cast5_size DATA
av_cast5_size
av_channel_layout_extract_channel
av_chroma_location_from_name
av_chroma_location_name
@ -117,9 +117,9 @@ EXPORTS
av_div_i
av_div_q
av_downmix_info_update_side_data
av_dynarray2_add
av_dynarray_add
av_dynarray_add_nofree
av_dynarray2_add
av_escape
av_expr_eval
av_expr_free
@ -277,14 +277,11 @@ EXPORTS
av_image_fill_pointers
av_image_get_buffer_size
av_image_get_linesize
av_int2i
av_int_list_length_for_size
av_int2i
av_lfg_init
av_lfg_init_from_data
av_log
av_log2
av_log2_16bit
av_log2_i
av_log_default_callback
av_log_format_line
av_log_format_line2
@ -293,8 +290,13 @@ EXPORTS
av_log_set_callback
av_log_set_flags
av_log_set_level
av_log2
av_log2_16bit
av_log2_i
av_malloc
av_malloc_array
av_mallocz
av_mallocz_array
av_mastering_display_metadata_alloc
av_mastering_display_metadata_create_side_data
av_match_list
@ -303,7 +305,7 @@ EXPORTS
av_md5_alloc
av_md5_final
av_md5_init
av_md5_size DATA
av_md5_size
av_md5_sum
av_md5_update
av_memcpy_backptr
@ -355,8 +357,8 @@ EXPORTS
av_opt_set_defaults
av_opt_set_defaults2
av_opt_set_dict
av_opt_set_dict2
av_opt_set_dict_val
av_opt_set_dict2
av_opt_set_double
av_opt_set_from_string
av_opt_set_image_size
@ -399,7 +401,7 @@ EXPORTS
av_ripemd_alloc
av_ripemd_final
av_ripemd_init
av_ripemd_size DATA
av_ripemd_size
av_ripemd_update
av_sample_fmt_is_planar
av_samples_alloc
@ -410,16 +412,16 @@ EXPORTS
av_samples_set_silence
av_set_cpu_flags_mask
av_set_options_string
av_sha512_alloc
av_sha512_final
av_sha512_init
av_sha512_size DATA
av_sha512_update
av_sha_alloc
av_sha_final
av_sha_init
av_sha_size DATA
av_sha_size
av_sha_update
av_sha512_alloc
av_sha512_final
av_sha512_init
av_sha512_size
av_sha512_update
av_shr_i
av_small_strptime
av_spherical_alloc
@ -450,7 +452,7 @@ EXPORTS
av_tea_alloc
av_tea_crypt
av_tea_init
av_tea_size DATA
av_tea_size
av_tempfile
av_thread_message_flush
av_thread_message_queue_alloc
@ -474,14 +476,14 @@ EXPORTS
av_tree_find
av_tree_insert
av_tree_node_alloc
av_tree_node_size DATA
av_tree_node_size
av_twofish_alloc
av_twofish_crypt
av_twofish_init
av_twofish_size DATA
av_twofish_size
av_usleep
av_utf8_decode
av_util_ffversion DATA
av_util_ffversion
av_vbprintf
av_version_info
av_vlog
@ -492,10 +494,9 @@ EXPORTS
av_xtea_le_crypt
av_xtea_le_init
avpriv_alloc_fixed_dsp
avpriv_cga_font DATA
avpriv_cga_font
avpriv_dict_set_timestamp
avpriv_float_dsp_alloc
avpriv_frame_get_metadatap
avpriv_get_gamma_from_trc
avpriv_get_trc_function_from_trc
avpriv_init_lls
@ -509,7 +510,7 @@ EXPORTS
avpriv_slicethread_free
avpriv_solve_lls
avpriv_tempfile
avpriv_vga16_font DATA
avpriv_vga16_font
avutil_configuration
avutil_license
avutil_version

BIN
ext_libs/avutil-vgmstream-55.dll → ext_libs/avutil-vgmstream-56.dll
View File

Binary file not shown.

17
ext_libs/avutil-vgmstream-56.dll.asc Normal file
View File

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAABCAAGBQJaB8iLAAoJEI1smEefSt5xbcsP/3H3Dg77eXvlGOCJJT6iAfbB
aRRe/syEL3zZMOaQM8buCTEOWXIVOefqA98AxJntMC/vaOGNS/1aU8+awoHQ4QJf
RJLmG3cljk/xfBd+LygBXNfjDB3tzuYyBEAzsgRintvKN3fKhnsb//IU+J+mOVpJ
WcIdyYl36lD/ogpH+Edury6QANKQgI65Xg9Mz0goEyDXEnw+5EgiLLF0c74ZjN/w
5sgAQ8tIkstq95XhPq3JqxWQaSqY04jr5s7vrz7Byv6H3581Dduo9VQU0KEAVOmO
eXg14sBopB/NpcUasEyyazISTPMo/xYc63YkeFBKeiFhu/ndVl+2iQ0gP5+ivaEh
q4IAjukkkN66834l5UoaK1hBmopSd2YIuWnxvA+/AHCuh7oMYsueXLHfclJEmUay
lguoNMUwKr7T7po9GtJrW5+iWti8arL8eftB/Bondc+8nrchQOLxDvhaQY9TGZv1
m7518T6gEDOHVU5R4hzJBj+yilanlylALGLEicqQeaiq47xNEM9LBQ8RPrNkBIS0
NQf12zc7l016L0Ogbr0gU4uplG12MFXP2mz2/xqfKGcpbq1BVhUDR7szJNeGhY7e
dN32X7rVlPF8FwVT8WzVZ8s0qk/NLje7thQSQdHCYEhcNVfhwwx54/hv+xTaUJym
bSQXOm2A73ANDv9ZG/zS
=LO79
-----END PGP SIGNATURE-----

24
ext_libs/ext_libs.vcproj
View File

@ -156,7 +156,7 @@
</FileConfiguration>
</File>
<File
RelativePath=".\avcodec-vgmstream-57.def"
RelativePath=".\avcodec-vgmstream-58.def"
>
<FileConfiguration
Name="Debug|Win32"
@ -164,7 +164,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Building library stub"
CommandLine="lib /def:avcodec-vgmstream-57.def /machine:x86 /out:avcodec.lib&#x0D;&#x0A;"
CommandLine="lib /def:avcodec-vgmstream-58.def /machine:x86 /out:avcodec.lib&#x0D;&#x0A;"
Outputs="avcodec.lib avcodec.exp"
/>
</FileConfiguration>
@ -174,13 +174,13 @@
<Tool
Name="VCCustomBuildTool"
Description="Building library stub"
CommandLine="lib /def:avcodec-vgmstream-57.def /machine:x86 /out:avcodec.lib&#x0D;&#x0A;"
CommandLine="lib /def:avcodec-vgmstream-58.def /machine:x86 /out:avcodec.lib&#x0D;&#x0A;"
Outputs="avcodec.lib avcodec.exp"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\avformat-vgmstream-57.def"
RelativePath=".\avformat-vgmstream-58.def"
>
<FileConfiguration
Name="Debug|Win32"
@ -188,7 +188,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Building library stub"
CommandLine="lib /def:avformat-vgmstream-57.def /machine:x86 /out:avformat.lib&#x0D;&#x0A;"
CommandLine="lib /def:avformat-vgmstream-58.def /machine:x86 /out:avformat.lib&#x0D;&#x0A;"
Outputs="avformat.lib avformat.exp"
/>
</FileConfiguration>
@ -198,13 +198,13 @@
<Tool
Name="VCCustomBuildTool"
Description="Building library stub"
CommandLine="lib /def:avformat-vgmstream-57.def /machine:x86 /out:avformat.lib&#x0D;&#x0A;"
CommandLine="lib /def:avformat-vgmstream-58.def /machine:x86 /out:avformat.lib&#x0D;&#x0A;"
Outputs="avformat.lib avformat.exp"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\avutil-vgmstream-57.def"
RelativePath=".\avutil-vgmstream-56.def"
>
<FileConfiguration
Name="Debug|Win32"
@ -212,7 +212,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Building library stub"
CommandLine="lib /def:avutil-vgmstream-55.def /machine:x86 /out:avutil.lib&#x0D;&#x0A;"
CommandLine="lib /def:avutil-vgmstream-56.def /machine:x86 /out:avutil.lib&#x0D;&#x0A;"
Outputs="avutil.lib avutil.exp"
/>
</FileConfiguration>
@ -222,13 +222,13 @@
<Tool
Name="VCCustomBuildTool"
Description="Building library stub"
CommandLine="lib /def:avutil-vgmstream-55.def /machine:x86 /out:avutil.lib&#x0D;&#x0A;"
CommandLine="lib /def:avutil-vgmstream-56.def /machine:x86 /out:avutil.lib&#x0D;&#x0A;"
Outputs="avutil.lib avutil.exp"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\swresample-vgmstream-2.def"
RelativePath=".\swresample-vgmstream-3.def"
>
<FileConfiguration
Name="Debug|Win32"
@ -236,7 +236,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Building library stub"
CommandLine="lib /def:swresample-vgmstream-2.def /machine:x86 /out:swresample.lib&#x0D;&#x0A;"
CommandLine="lib /def:swresample-vgmstream-3.def /machine:x86 /out:swresample.lib&#x0D;&#x0A;"
Outputs="swresample.lib swresample.exp"
/>
</FileConfiguration>
@ -246,7 +246,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Building library stub"
CommandLine="lib /def:swresample-vgmstream-2.def /machine:x86 /out:swresample.lib&#x0D;&#x0A;"
CommandLine="lib /def:swresample-vgmstream-3.def /machine:x86 /out:swresample.lib&#x0D;&#x0A;"
Outputs="swresample.lib swresample.exp"
/>
</FileConfiguration>

16
ext_libs/ext_libs.vcxproj
View File

@ -93,24 +93,24 @@
</Command>
<Outputs>libg719_decode.lib;libg719_decode.exp;%(Outputs)</Outputs>
</CustomBuild>
<CustomBuild Include="avcodec-vgmstream-57.def">
<CustomBuild Include="avcodec-vgmstream-58.def">
<Message>Building library stub</Message>
<Command>lib /def:avcodec-vgmstream-57.def /machine:x86 /out:avcodec.lib</Command>
<Command>lib /def:avcodec-vgmstream-58.def /machine:x86 /out:avcodec.lib</Command>
<Outputs>avcodec.lib;avcodec.exp;%(Outputs)</Outputs>
</CustomBuild>
<CustomBuild Include="avformat-vgmstream-57.def">
<CustomBuild Include="avformat-vgmstream-58.def">
<Message>Building library stub</Message>
<Command>lib /def:avformat-vgmstream-57.def /machine:x86 /out:avformat.lib</Command>
<Command>lib /def:avformat-vgmstream-58.def /machine:x86 /out:avformat.lib</Command>
<Outputs>avformat.lib;avformat.exp;%(Outputs)</Outputs>
</CustomBuild>
<CustomBuild Include="avutil-vgmstream-55.def">
<CustomBuild Include="avutil-vgmstream-56.def">
<Message>Building library stub</Message>
<Command>lib /def:avutil-vgmstream-55.def /machine:x86 /out:avutil.lib</Command>
<Command>lib /def:avutil-vgmstream-56.def /machine:x86 /out:avutil.lib</Command>
<Outputs>avutil.lib;avutil.exp;%(Outputs)</Outputs>
</CustomBuild>
<CustomBuild Include="swresample-vgmstream-2.def">
<CustomBuild Include="swresample-vgmstream-3.def">
<Message>Building library stub</Message>
<Command>lib /def:swresample-vgmstream-2.def /machine:x86 /out:swresample.lib</Command>
<Command>lib /def:swresample-vgmstream-3.def /machine:x86 /out:swresample.lib</Command>
<Outputs>swresample.lib;swresample.exp;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>

4
ext_libs/ffmpeg_options.txt
View File

@ -21,8 +21,8 @@
--enable-hwaccels
--enable-swresample
--enable-parser=ac3,mpegaudio,xma,vorbis,opus
--enable-demuxer=ac3,asf,xwma,mov,oma,ogg,tak,dsf,wav,aac,dts,dtshd,mp3,bink,flac,msf,xmv,caf,ape,smacker
--enable-decoder=ac3,wmapro,wmav1,wmav2,wmavoice,wmalossless,xma1,xma2,dca,tak,dsd_lsbf,dsd_lsbf_planar,dsd_mbf,dsd_msbf_planar,aac,atrac3,atrac3p,mp3float,bink,binkaudio_dct,binkaudio_rdft,flac,pcm_s16be,pcm_s16be_planar,pcm_s16le,pcm_s16le_planar,vorbis,ape,adpcm_ima_qt,smackaud,opus
--enable-demuxer=ac3,asf,xwma,mov,oma,ogg,tak,dsf,wav,aac,dts,dtshd,mp3,bink,flac,msf,xmv,caf,ape,smacker,pcm_s8,spdif
--enable-decoder=ac3,wmapro,wmav1,wmav2,wmavoice,wmalossless,xma1,xma2,dca,tak,dsd_lsbf,dsd_lsbf_planar,dsd_mbf,dsd_msbf_planar,aac,atrac3,atrac3p,mp3float,bink,binkaudio_dct,binkaudio_rdft,flac,pcm_s16be,pcm_s16be_planar,pcm_s16le,pcm_s16le_planar,vorbis,ape,adpcm_ima_qt,smackaud,opus,pcm_s8,pcm_s8_planar
--disable-parser=mpeg4video,h263
--disable-decoder=mpeg2video,h263,h264,mpeg1video,mpeg2video,mpeg4,hevc,vp9
--disable-cuvid

BIN
ext_libs/swresample-vgmstream-2.dll
View File

Binary file not shown.

17
ext_libs/swresample-vgmstream-2.dll.asc
View File

@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAABCAAGBQJZ4qGIAAoJEI1smEefSt5xPs4P/3soSNqau0s/i275ERspq2fX
JGRiBFhS9tyj66VQ4gn0qdol4IHyUY5EiMcTQPi/u8wdnmKPjEjeCB5nmD43uCEb
1D9Wl0Gi+culHaMVCLhq8mg9edZD5RrO6m6V8lj7eBh499/gI9OiopjR9ifjrMtH
/VfPZctHlkFAdp9WCLihWb0srJDOwL4M4rOMiBgB2g53Vo06zmY5vhStnjez+jNL
wOyd2TKFXRAya0wLdG3e9szjUy/kvnyNjYenDQRu/SodKko0aof81qvhTG74tnZt
SlbU0YWBxH92X4XhA6gP/iDpwLT0v9li68RZSt9nSwwEbNltMNKbe5gzAbcVYM2g
ZuCmI4F4B1nID8wJzKiFFu5Wm/9nOZbQRNZOZrhoB9MxZz5qj6Wq7p5JVkffi8cr
pv8uCy4xsZyPJtr7kDl9p8uDICnh762Yhous5cMAoJNpC0Tibalt2dc5AQoi6etk
1SfDmmkXMh12ynUGVxV+79EsWZQRZasU0pbzKWB9z9I4atTyIyMpUyWJEh5nV8gC
/2k6fPx5LFBuntGBSgRpdzye64TaNtshaUKEqdvDnyVNhq3O5I27kNiyUD0jSS0R
T5bsXKphp2HC+EGbC1LcadSouRbm0fMtWrcYm/Yecvv7BLDChB81qbZBwZgz5al0
8vxQCAxIFhrk1nEFqlAd
=cz4P
-----END PGP SIGNATURE-----

2
ext_libs/swresample-vgmstream-2.def → ext_libs/swresample-vgmstream-3.def
View File

@ -7,7 +7,7 @@ EXPORTS
swr_convert
swr_convert_frame
swr_drop_output
swr_ffversion DATA
swr_ffversion
swr_free
swr_get_class
swr_get_delay

BIN
ext_libs/swresample-vgmstream-3.dll Normal file
View File

Binary file not shown.

17
ext_libs/swresample-vgmstream-3.dll.asc Normal file
View File

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAABCAAGBQJaB8iKAAoJEI1smEefSt5xz30QAKwGwcXJFPOUe5+yoEhRNnZf
/FS7tn9VraJRJNFTWeUvVrsOm+4j2BeEwv8UARPXYk80NVp2M01hz3SfM/yAT97O
O+rO04bSthUN26eVW5K4g5wvjXOhjM6lE3p22RQOG+70cfoX5wfXdcsgrRwYHKUy
IOBoARF+LIba6/xnkIaCKT6BNKkUplaoq8K4DmUMQkUMPp9Ip0gOfVrS+TYU8Jug
ZBGvEwevuE8KdGAFS7A7HMsxW8oa9/9eyiaJIcmusMODriMAGogjOgCkxJvG3FJw
sCYhsIJb504SBJATU0gH4nqQEQK447uE3gsup+gn7Auda1In8kwnGAm2SA0voWVS
RU89MB5Ef7F0Mj3eya/4BAwGNmzzz/vXTQnMd3Oqlz0NUZrYXGcRvtl3976xObwO
4Ps5rIRrOb9o8hLjegNXh+Vnk0Kd4zFeg4wIYbTdoO/SRdnVntY0V8xBczzKGvIi
kNwu3/G1IpDgJQJBYoeqrW8iVnnYI7SLIOUS3hP9fdYyOyhnn004IDbOwOv1BhsN
wmH1imm/jbolCOKX/aWMOiwUNy+Zf6HM5oqS37w+wMDXO2CgKI4aJ7tt89Jo8aK6
+dJdRqHGY3LBRThWyiN1b/Qa6VFXJ94mhoEY3j1S9LN6PwzctS6/uWgf71XPtJzA
wwhc2YKbhwrr/qtrgZ5J
=oOIq
-----END PGP SIGNATURE-----