diff --git a/ext_includes/libavcodec/avcodec.h b/ext_includes/libavcodec/avcodec.h index 7ac2adaf..ca8b7860 100644 --- a/ext_includes/libavcodec/avcodec.h +++ b/ext_includes/libavcodec/avcodec.h @@ -411,6 +411,8 @@ enum AVCodecID { AV_CODEC_ID_MAGICYUV, AV_CODEC_ID_SHEERVIDEO, AV_CODEC_ID_YLC, + AV_CODEC_ID_PSD, + AV_CODEC_ID_PIXLET, /* various PCM "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_S64BE, + AV_CODEC_ID_PCM_F16LE, + AV_CODEC_ID_PCM_F24LE, /* various ADPCM codecs */ AV_CODEC_ID_ADPCM_IMA_QT = 0x11000, @@ -3570,6 +3574,14 @@ typedef struct AVCodecContext { */ 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; AVRational av_codec_get_pkt_timebase (const AVCodecContext *avctx); diff --git a/ext_includes/libavcodec/version.h b/ext_includes/libavcodec/version.h index 625f9475..c5a8f558 100644 --- a/ext_includes/libavcodec/version.h +++ b/ext_includes/libavcodec/version.h @@ -28,7 +28,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 57 -#define LIBAVCODEC_VERSION_MINOR 67 +#define LIBAVCODEC_VERSION_MINOR 71 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ diff --git a/ext_includes/libavformat/avio.h b/ext_includes/libavformat/avio.h index b1ce1d1c..e2cb4af7 100644 --- a/ext_includes/libavformat/avio.h +++ b/ext_includes/libavformat/avio.h @@ -703,6 +703,18 @@ int avio_closep(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 * must be freed with av_free(). diff --git a/ext_includes/libavformat/version.h b/ext_includes/libavformat/version.h index 192b790b..21cc8a99 100644 --- a/ext_includes/libavformat/version.h +++ b/ext_includes/libavformat/version.h @@ -32,7 +32,7 @@ // 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 59 +#define LIBAVFORMAT_VERSION_MINOR 62 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ diff --git a/ext_includes/libavutil/cpu.h b/ext_includes/libavutil/cpu.h index 4bff1671..8499f0ea 100644 --- a/ext_includes/libavutil/cpu.h +++ b/ext_includes/libavutil/cpu.h @@ -85,8 +85,6 @@ void av_force_cpu_flags(int flags); * Set a mask on flags returned by av_get_cpu_flags(). * This function is mainly useful for testing. * 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); diff --git a/ext_includes/libavutil/ffversion.h b/ext_includes/libavutil/ffversion.h index 582edda2..bc8fdb12 100644 --- a/ext_includes/libavutil/ffversion.h +++ b/ext_includes/libavutil/ffversion.h @@ -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-82810-g8258e36" +#define FFMPEG_VERSION "N-83027-g0ddc24d" #endif /* AVUTIL_FFVERSION_H */ diff --git a/ext_includes/libavutil/imgutils.h b/ext_includes/libavutil/imgutils.h index 23282a38..40aee8b9 100644 --- a/ext_includes/libavutil/imgutils.h +++ b/ext_includes/libavutil/imgutils.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); +/** + * 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. * diff --git a/ext_includes/libavutil/pixdesc.h b/ext_includes/libavutil/pixdesc.h index a8ad5889..ef3f48c6 100644 --- a/ext_includes/libavutil/pixdesc.h +++ b/ext_includes/libavutil/pixdesc.h @@ -22,7 +22,11 @@ #ifndef AVUTIL_PIXDESC_H #define AVUTIL_PIXDESC_H +/* modification for MSVC by kode54 */ +#ifndef _MSC_VER #include +#endif +/* end modification */ #include "attributes.h" #include "pixfmt.h" diff --git a/ext_includes/libavutil/spherical.h b/ext_includes/libavutil/spherical.h index 0a669da8..eeda6252 100644 --- a/ext_includes/libavutil/spherical.h +++ b/ext_includes/libavutil/spherical.h @@ -26,6 +26,9 @@ #ifndef AVUTIL_SPHERICAL_H #define AVUTIL_SPHERICAL_H +#include +#include + /** * @addtogroup lavu_video * @{ diff --git a/ext_includes/libavutil/version.h b/ext_includes/libavutil/version.h index 301c11bc..9f8c4c23 100644 --- a/ext_includes/libavutil/version.h +++ b/ext_includes/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 55 -#define LIBAVUTIL_VERSION_MINOR 42 +#define LIBAVUTIL_VERSION_MINOR 43 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ diff --git a/ext_libs/avcodec-vgmstream-57.dll b/ext_libs/avcodec-vgmstream-57.dll index f855a3c7..c6bfd784 100644 Binary files a/ext_libs/avcodec-vgmstream-57.dll and b/ext_libs/avcodec-vgmstream-57.dll differ diff --git a/ext_libs/avformat-vgmstream-57.def b/ext_libs/avformat-vgmstream-57.def index 7258202f..c6e343cd 100644 --- a/ext_libs/avformat-vgmstream-57.def +++ b/ext_libs/avformat-vgmstream-57.def @@ -118,6 +118,7 @@ EXPORTS avio_find_protocol_name avio_flush avio_free_directory_entry + avio_get_dyn_buf avio_get_str avio_get_str16be avio_get_str16le diff --git a/ext_libs/avformat-vgmstream-57.dll b/ext_libs/avformat-vgmstream-57.dll index 6953ecc1..b2745ad7 100644 Binary files a/ext_libs/avformat-vgmstream-57.dll and b/ext_libs/avformat-vgmstream-57.dll differ diff --git a/ext_libs/avutil-vgmstream-55.def b/ext_libs/avutil-vgmstream-55.def index a3e18fdf..4ea4b69e 100644 --- a/ext_libs/avutil-vgmstream-55.def +++ b/ext_libs/avutil-vgmstream-55.def @@ -248,6 +248,7 @@ EXPORTS av_image_alloc av_image_check_sar av_image_check_size + av_image_check_size2 av_image_copy av_image_copy_plane av_image_copy_to_buffer diff --git a/ext_libs/avutil-vgmstream-55.dll b/ext_libs/avutil-vgmstream-55.dll index 2a603923..ced29d15 100644 Binary files a/ext_libs/avutil-vgmstream-55.dll and b/ext_libs/avutil-vgmstream-55.dll differ