Updated FFmpeg binaries.

This commit is contained in:
Christopher Snowhill 2017-02-28 19:16:15 -08:00
parent dae2cead2e
commit 59c2a57ecf
13 changed files with 103 additions and 5 deletions

View File

@ -414,6 +414,8 @@ enum AVCodecID {
AV_CODEC_ID_PSD,
AV_CODEC_ID_PIXLET,
AV_CODEC_ID_SPEEDHQ,
AV_CODEC_ID_FMVC,
AV_CODEC_ID_SCPR,
/* various PCM "codecs" */
AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs
@ -603,6 +605,8 @@ enum AVCodecID {
AV_CODEC_ID_XMA1,
AV_CODEC_ID_XMA2,
AV_CODEC_ID_DST,
AV_CODEC_ID_ATRAC3AL,
AV_CODEC_ID_ATRAC3PAL,
/* subtitle codecs */
AV_CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs.
@ -3533,7 +3537,8 @@ typedef struct AVCodecContext {
/**
* A reference to the AVHWFramesContext describing the input (for encoding)
* or output (decoding) frames. The reference is set by the caller and
* afterwards owned (and freed) by libavcodec.
* afterwards owned (and freed) by libavcodec - it should never be read by
* the caller after being set.
*
* - decoding: This field should be set by the caller from the get_format()
* callback. The previous reference (if any) will always be
@ -3583,6 +3588,27 @@ typedef struct AVCodecContext {
*/
int64_t max_pixels;
/**
* A reference to the AVHWDeviceContext describing the device which will
* be used by a hardware encoder/decoder. The reference is set by the
* caller and afterwards owned (and freed) by libavcodec.
*
* This should be used if either the codec device does not require
* hardware frames or any that are used are to be allocated internally by
* libavcodec. If the user wishes to supply any of the frames used as
* encoder input or decoder output then hw_frames_ctx should be used
* instead. When hw_frames_ctx is set in get_format() for a decoder, this
* field will be ignored while decoding the associated stream segment, but
* may again be used on a following one after another get_format() call.
*
* For both encoders and decoders this field should be set before
* avcodec_open2() is called and must not be written to thereafter.
*
* Note that some decoders may require this field to be set initially in
* order to support hw_frames_ctx at all - in that case, all frames
* contexts used must be created on the same device.
*/
AVBufferRef *hw_device_ctx;
} AVCodecContext;
AVRational av_codec_get_pkt_timebase (const AVCodecContext *avctx);

View File

@ -28,7 +28,7 @@
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR 75
#define LIBAVCODEC_VERSION_MINOR 81
#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

View File

@ -313,6 +313,12 @@ typedef struct AVIOContext {
*/
enum AVIODataMarkerType current_type;
int64_t last_time;
/**
* A callback that is used instead of short_seek_threshold.
* This is current internal only, do not use from outside.
*/
int (*short_seek_get)(void *opaque);
} AVIOContext;
/**

View File

@ -33,7 +33,7 @@
// Also please add any ticket numbers that you believe might be affected here
#define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MINOR 66
#define LIBAVFORMAT_VERSION_MICRO 101
#define LIBAVFORMAT_VERSION_MICRO 102
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
@ -85,6 +85,10 @@
#ifndef FF_API_HTTP_USER_AGENT
#define FF_API_HTTP_USER_AGENT (LIBAVFORMAT_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_HLS_WRAP
#define FF_API_HLS_WRAP (LIBAVFORMAT_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_R_FRAME_RATE
#define FF_API_R_FRAME_RATE 1

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-83421-gc6b447e4e5"
#define FFMPEG_VERSION "N-83693-g11e629a4c0"
#endif /* AVUTIL_FFVERSION_H */

View File

@ -538,6 +538,17 @@ typedef struct AVFrame {
* AVHWFramesContext describing the frame.
*/
AVBufferRef *hw_frames_ctx;
/**
* AVBufferRef for free use by the API user. FFmpeg will never check 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 opaque_ref field.
*
* This is unrelated to the opaque field, although it serves a similar
* purpose.
*/
AVBufferRef *opaque_ref;
} AVFrame;
/**

View File

@ -79,7 +79,7 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 55
#define LIBAVUTIL_VERSION_MINOR 46
#define LIBAVUTIL_VERSION_MINOR 47
#define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \

Binary file not shown.

View File

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAABCAAGBQJYtjy/AAoJEI1smEefSt5xtqgQAKFIkXsgO9lJqY+UZ+/kx+l6
oASaOAl8UFM+L7VXg1NJ4WCETc5M/OY2D0d45HBEfHwRYlLMOqNIXiI4VumPYrFQ
Fg1VQyfKNCQiGdjpY0Klu5Ew3EW/PSFOHTqAXK8wavXzBG7jWOYiv7jM11/r21mJ
4yyuPR3RWxUMGrC7DEek4yatdnjWgmVgTrEPy1d6s6AVMihtKL5zEfUUEj9NA64m
7BGLMBCa6K4XoK1ZZQMVFHLDkd3xrR1fbgqVRXYfWuUv3bR/izLxd93zV+aHoBhb
DdsK+7ERlMbkIWwHnGDTsdqrO5v+qk+Ec73sd+lMqJUshX/eO9EXkhsFM98F4is8
r1wgRQiXtgUp80qDGDgQktTDpW+pwqxk/r/dgDBBN9sRP0LZk4Vv7uXUEoxhH7Ao
4v9KZ7i1YRQ3D2HU/CsN/KXPgwq2erhhG7jdWwwttnTl/DFtjsjwtRZgi5iU65Wg
i9dxNcScsM4VUKt+vCaSgU90jElmph31WIxeGMJfzHoQeXd5Qu0oW17nIPH2YfhM
2V928h6X7otHVX4QAueOAG102h5uD3Lacbm04el37PHpq2XjPiGgxm4WGCV1ZOEm
5HMeanR/M2J3mid7nLCCho8RVvdGQVISTan0XfX3KtY0R4tdmkNd6UV6o+TH49A1
1gZhrZflzueWCCJjBhE5
=Odm/
-----END PGP SIGNATURE-----

Binary file not shown.

View File

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAABCAAGBQJYtjy+AAoJEI1smEefSt5xlHUP/2Owe7YF26Gp2rC8D3RY7FnQ
vi3CSFXCzovL2zxXu8JLlGzAKv5YB8JQQQHuizeXe1YwMIhznHb6w7AHWRDhpaKc
lhaRb89hiToN9MZQH/X3jXjl/sKe1oqGKxpfe3pmbsueNyegHsfLi3CxqC2OLvtT
T9bRFR8jAKecejmNTwgves0yYCKFXGAFHwhbTeNpxWtllmTOJ0/u0260shNKXsUH
qTzLfjm4Rx0rNTNKWd1UA4yJFV/glLuF+qvUIJvJ5YUx9IfiWeE88EfZ1kZjrxv5
0Q9VFsNc23jiqKCjRdo1BmCacHXB+2fl7yV0gMEIH5kA4BPv+gZBOn9QUuCnuHr1
AHTNO7ZP4GsD3E8jL+F5nxZHxjpT7PNlouB0zwpBvFeD7UAf+cX0gvHahYWLBG38
H2gygSd+HE/u/xJ6xyQJvey1ZAFKNlw7nuyfNs2DzpciB/k1eQ7nkuULSjANj/G9
gkfESZEd8jztpY229IjdYzZqk/6VtXfjhhHNp1WJh+7ItwcPW1tcVpYeegvz6TsA
U3uUGrObMGWVnfK+6XGpaGECfytxC84uSIESH80pKgs8n3DtBmLtdJiV/UPRXpIB
3liwDpHqTcc/xbHc1ux684cgbGdeE1VzdUgPJ4vbb1CSerRJrNWX7bllO2tYaaBW
ZGsPc8H5WBTcySMIziqp
=uNjj
-----END PGP SIGNATURE-----

Binary file not shown.

View File

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAABCAAGBQJYtjy/AAoJEI1smEefSt5xt4sQAKyE3m1GiNEpwAEeH+1lDQnM
ZDdr570cwkXvHyu+5opmQrBK/BQZsQSVvf8/S3X/yE2SXQdtAQEFFHc/OxuKYeKn
FctOvdBtWe4TmJeN3tL/teGRZ8ZQiIjPmyrlt2Dw0CD0Q6iO/qy+4Cc7sGYoDwJB
THReZm3QeqRnve8nv8seqRkR7DBnLtOZMM/pAjREKlbTb0ad0kY5OTfLTdR1UJum
lWU7LNekZGdb0hPpcSNk7HimBbxeQuVPVFXmFTgenpHt+wu8lPgrOGGiG/I/uDAJ
OZHILGhrR9i4n1H8yk2CcJT/kQuXvaYaAuvfV5xLnMwMtiv8Gf8ztyTLp3nH0T2r
dtC2cEzB0maffH+eVd26r/D2NsGU6HWrgXweiOfnfH5TpwHF7mM7MT2wbDzvOJGw
MTIPALIlrrJ3G29qvTjfiW33oQz3VUmeasuq00TE6sU85kn162Mzu5qilgKQYAEi
o9VE0NHFQRGzWeJQCTTpFPROWyNVm5JjB8LeXPHqZdoGSIm6+bL+mTO0lpXgriRS
7hSeELPjT+osY/4ipKHKUVNJWQzc897+c8Li4IdZZzdhnDowoiBkdUSEx/FPbpOV
I8Lg7mwc6gMYmljvxV5x9yRonA+OSdOYJ0pFg9e3g8hT3AoQrAWFhwb7vulqMHim
SBBuGvINQCjeS4WIxWn2
=yEf5
-----END PGP SIGNATURE-----