mirror of
https://github.com/vgmstream/vgmstream.git
synced 2024-09-24 03:08:21 +02:00
Updated FFmpeg.
This commit is contained in:
parent
b1e81c8682
commit
5aa501c329
@ -411,6 +411,8 @@ enum AVCodecID {
|
|||||||
AV_CODEC_ID_MAGICYUV,
|
AV_CODEC_ID_MAGICYUV,
|
||||||
AV_CODEC_ID_SHEERVIDEO,
|
AV_CODEC_ID_SHEERVIDEO,
|
||||||
AV_CODEC_ID_YLC,
|
AV_CODEC_ID_YLC,
|
||||||
|
AV_CODEC_ID_PSD,
|
||||||
|
AV_CODEC_ID_PIXLET,
|
||||||
|
|
||||||
/* various PCM "codecs" */
|
/* various PCM "codecs" */
|
||||||
AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs
|
AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs
|
||||||
@ -448,6 +450,8 @@ enum AVCodecID {
|
|||||||
|
|
||||||
AV_CODEC_ID_PCM_S64LE = 0x10800,
|
AV_CODEC_ID_PCM_S64LE = 0x10800,
|
||||||
AV_CODEC_ID_PCM_S64BE,
|
AV_CODEC_ID_PCM_S64BE,
|
||||||
|
AV_CODEC_ID_PCM_F16LE,
|
||||||
|
AV_CODEC_ID_PCM_F24LE,
|
||||||
|
|
||||||
/* various ADPCM codecs */
|
/* various ADPCM codecs */
|
||||||
AV_CODEC_ID_ADPCM_IMA_QT = 0x11000,
|
AV_CODEC_ID_ADPCM_IMA_QT = 0x11000,
|
||||||
@ -3570,6 +3574,14 @@ typedef struct AVCodecContext {
|
|||||||
*/
|
*/
|
||||||
int trailing_padding;
|
int trailing_padding;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The number of pixels per image to maximally accept.
|
||||||
|
*
|
||||||
|
* - decoding: set by user
|
||||||
|
* - encoding: set by user
|
||||||
|
*/
|
||||||
|
int64_t max_pixels;
|
||||||
|
|
||||||
} AVCodecContext;
|
} AVCodecContext;
|
||||||
|
|
||||||
AVRational av_codec_get_pkt_timebase (const AVCodecContext *avctx);
|
AVRational av_codec_get_pkt_timebase (const AVCodecContext *avctx);
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
#include "libavutil/version.h"
|
#include "libavutil/version.h"
|
||||||
|
|
||||||
#define LIBAVCODEC_VERSION_MAJOR 57
|
#define LIBAVCODEC_VERSION_MAJOR 57
|
||||||
#define LIBAVCODEC_VERSION_MINOR 67
|
#define LIBAVCODEC_VERSION_MINOR 71
|
||||||
#define LIBAVCODEC_VERSION_MICRO 100
|
#define LIBAVCODEC_VERSION_MICRO 100
|
||||||
|
|
||||||
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
|
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
|
||||||
|
@ -703,6 +703,18 @@ int avio_closep(AVIOContext **s);
|
|||||||
*/
|
*/
|
||||||
int avio_open_dyn_buf(AVIOContext **s);
|
int avio_open_dyn_buf(AVIOContext **s);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return the written size and a pointer to the buffer.
|
||||||
|
* The AVIOContext stream is left intact.
|
||||||
|
* The buffer must NOT be freed.
|
||||||
|
* No padding is added to the buffer.
|
||||||
|
*
|
||||||
|
* @param s IO context
|
||||||
|
* @param pbuffer pointer to a byte buffer
|
||||||
|
* @return the length of the byte buffer
|
||||||
|
*/
|
||||||
|
int avio_get_dyn_buf(AVIOContext *s, uint8_t **pbuffer);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the written size and a pointer to the buffer. The buffer
|
* Return the written size and a pointer to the buffer. The buffer
|
||||||
* must be freed with av_free().
|
* must be freed with av_free().
|
||||||
|
@ -32,7 +32,7 @@
|
|||||||
// Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)
|
// Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)
|
||||||
// Also please add any ticket numbers that you believe might be affected here
|
// Also please add any ticket numbers that you believe might be affected here
|
||||||
#define LIBAVFORMAT_VERSION_MAJOR 57
|
#define LIBAVFORMAT_VERSION_MAJOR 57
|
||||||
#define LIBAVFORMAT_VERSION_MINOR 59
|
#define LIBAVFORMAT_VERSION_MINOR 62
|
||||||
#define LIBAVFORMAT_VERSION_MICRO 100
|
#define LIBAVFORMAT_VERSION_MICRO 100
|
||||||
|
|
||||||
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
|
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
|
||||||
|
@ -85,8 +85,6 @@ void av_force_cpu_flags(int flags);
|
|||||||
* Set a mask on flags returned by av_get_cpu_flags().
|
* Set a mask on flags returned by av_get_cpu_flags().
|
||||||
* This function is mainly useful for testing.
|
* This function is mainly useful for testing.
|
||||||
* Please use av_force_cpu_flags() and av_get_cpu_flags() instead which are more flexible
|
* Please use av_force_cpu_flags() and av_get_cpu_flags() instead which are more flexible
|
||||||
*
|
|
||||||
* @warning this function is not thread safe.
|
|
||||||
*/
|
*/
|
||||||
attribute_deprecated void av_set_cpu_flags_mask(int mask);
|
attribute_deprecated void av_set_cpu_flags_mask(int mask);
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/* Automatically generated by version.sh, do not manually edit! */
|
/* Automatically generated by version.sh, do not manually edit! */
|
||||||
#ifndef AVUTIL_FFVERSION_H
|
#ifndef AVUTIL_FFVERSION_H
|
||||||
#define AVUTIL_FFVERSION_H
|
#define AVUTIL_FFVERSION_H
|
||||||
#define FFMPEG_VERSION "N-82810-g8258e36"
|
#define FFMPEG_VERSION "N-83027-g0ddc24d"
|
||||||
#endif /* AVUTIL_FFVERSION_H */
|
#endif /* AVUTIL_FFVERSION_H */
|
||||||
|
@ -191,6 +191,21 @@ int av_image_copy_to_buffer(uint8_t *dst, int dst_size,
|
|||||||
*/
|
*/
|
||||||
int av_image_check_size(unsigned int w, unsigned int h, int log_offset, void *log_ctx);
|
int av_image_check_size(unsigned int w, unsigned int h, int log_offset, void *log_ctx);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if the given dimension of an image is valid, meaning that all
|
||||||
|
* bytes of a plane of an image with the specified pix_fmt can be addressed
|
||||||
|
* with a signed int.
|
||||||
|
*
|
||||||
|
* @param w the width of the picture
|
||||||
|
* @param h the height of the picture
|
||||||
|
* @param max_pixels the maximum number of pixels the user wants to accept
|
||||||
|
* @param pix_fmt the pixel format, can be AV_PIX_FMT_NONE if unknown.
|
||||||
|
* @param log_offset the offset to sum to the log level for logging with log_ctx
|
||||||
|
* @param log_ctx the parent logging context, it may be NULL
|
||||||
|
* @return >= 0 if valid, a negative error code otherwise
|
||||||
|
*/
|
||||||
|
int av_image_check_size2(unsigned int w, unsigned int h, int64_t max_pixels, enum AVPixelFormat pix_fmt, int log_offset, void *log_ctx);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if the given sample aspect ratio of an image is valid.
|
* Check if the given sample aspect ratio of an image is valid.
|
||||||
*
|
*
|
||||||
|
@ -22,7 +22,11 @@
|
|||||||
#ifndef AVUTIL_PIXDESC_H
|
#ifndef AVUTIL_PIXDESC_H
|
||||||
#define AVUTIL_PIXDESC_H
|
#define AVUTIL_PIXDESC_H
|
||||||
|
|
||||||
|
/* modification for MSVC by kode54 */
|
||||||
|
#ifndef _MSC_VER
|
||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
|
#endif
|
||||||
|
/* end modification */
|
||||||
|
|
||||||
#include "attributes.h"
|
#include "attributes.h"
|
||||||
#include "pixfmt.h"
|
#include "pixfmt.h"
|
||||||
|
@ -26,6 +26,9 @@
|
|||||||
#ifndef AVUTIL_SPHERICAL_H
|
#ifndef AVUTIL_SPHERICAL_H
|
||||||
#define AVUTIL_SPHERICAL_H
|
#define AVUTIL_SPHERICAL_H
|
||||||
|
|
||||||
|
#include <stddef.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @addtogroup lavu_video
|
* @addtogroup lavu_video
|
||||||
* @{
|
* @{
|
||||||
|
@ -79,7 +79,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#define LIBAVUTIL_VERSION_MAJOR 55
|
#define LIBAVUTIL_VERSION_MAJOR 55
|
||||||
#define LIBAVUTIL_VERSION_MINOR 42
|
#define LIBAVUTIL_VERSION_MINOR 43
|
||||||
#define LIBAVUTIL_VERSION_MICRO 100
|
#define LIBAVUTIL_VERSION_MICRO 100
|
||||||
|
|
||||||
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
|
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
|
||||||
|
Binary file not shown.
@ -118,6 +118,7 @@ EXPORTS
|
|||||||
avio_find_protocol_name
|
avio_find_protocol_name
|
||||||
avio_flush
|
avio_flush
|
||||||
avio_free_directory_entry
|
avio_free_directory_entry
|
||||||
|
avio_get_dyn_buf
|
||||||
avio_get_str
|
avio_get_str
|
||||||
avio_get_str16be
|
avio_get_str16be
|
||||||
avio_get_str16le
|
avio_get_str16le
|
||||||
|
Binary file not shown.
@ -248,6 +248,7 @@ EXPORTS
|
|||||||
av_image_alloc
|
av_image_alloc
|
||||||
av_image_check_sar
|
av_image_check_sar
|
||||||
av_image_check_size
|
av_image_check_size
|
||||||
|
av_image_check_size2
|
||||||
av_image_copy
|
av_image_copy
|
||||||
av_image_copy_plane
|
av_image_copy_plane
|
||||||
av_image_copy_to_buffer
|
av_image_copy_to_buffer
|
||||||
|
Binary file not shown.
Loading…
Reference in New Issue
Block a user