[FFmpeg-cvslog] Merge commit '577326d430593a25456393a75212b95d1cd94131'
James Almer
git at videolan.org
Tue Sep 26 22:43:21 EEST 2017
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Sep 26 16:38:55 2017 -0300| [b1cf151c4dfdbd049cd41863b4e0cde927585e17] | committer: James Almer
Merge commit '577326d430593a25456393a75212b95d1cd94131'
* commit '577326d430593a25456393a75212b95d1cd94131':
lavc: deprecate refcounted_frames field
Merged-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b1cf151c4dfdbd049cd41863b4e0cde927585e17
---
doc/APIchanges | 6 ++++++
libavcodec/avcodec.h | 1 +
libavcodec/version.h | 2 +-
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/doc/APIchanges b/doc/APIchanges
index d06144f1e9..52336d1dec 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -15,6 +15,12 @@ libavutil: 2015-08-28
API changes, most recent first:
+2017-09-26 - xxxxxxx - lavc 57.106.102 - avcodec.h
+ Deprecate AVCodecContext.refcounted_frames. This was useful for deprecated
+ API only (avcodec_decode_video2/avcodec_decode_audio4). The new decode APIs
+ (avcodec_send_packet/avcodec_receive_frame) always work with reference
+ counted frames.
+
2017-xx-xx - xxxxxxx - lavu 55.76.100 / 56.6.0 - pixdesc.h
Add av_color_range_from_name(), av_color_primaries_from_name(),
av_color_transfer_from_name(), av_color_space_from_name(), and
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 07d9f3e255..b5bbc591ac 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2683,6 +2683,7 @@ typedef struct AVCodecContext {
* - encoding: unused
* - decoding: set by the caller before avcodec_open2().
*/
+ attribute_deprecated
int refcounted_frames;
/* - encoding parameters */
diff --git a/libavcodec/version.h b/libavcodec/version.h
index e1224752bd..3008460b93 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR 106
-#define LIBAVCODEC_VERSION_MICRO 101
+#define LIBAVCODEC_VERSION_MICRO 102
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
======================================================================
diff --cc doc/APIchanges
index d06144f1e9,c161618d92..52336d1dec
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@@ -15,77 -13,13 +15,83 @@@ libavutil: 2015-08-2
API changes, most recent first:
-2017-02-01 - xxxxxxx - lavc - avcodec.h
++2017-09-26 - xxxxxxx - lavc 57.106.102 - avcodec.h
+ Deprecate AVCodecContext.refcounted_frames. This was useful for deprecated
+ API only (avcodec_decode_video2/avcodec_decode_audio4). The new decode APIs
+ (avcodec_send_packet/avcodec_receive_frame) always work with reference
+ counted frames.
+
-2016-xx-xx - xxxxxxx - lavc 57.31.0 - avcodec.h
+2017-xx-xx - xxxxxxx - lavu 55.76.100 / 56.6.0 - pixdesc.h
+ Add av_color_range_from_name(), av_color_primaries_from_name(),
+ av_color_transfer_from_name(), av_color_space_from_name(), and
+ av_chroma_location_from_name().
+
+2017-09-13 - xxxxxxx - lavc 57.106.100 - avcodec.h
+ Add AV_PKT_FLAG_TRUSTED.
+
+2017-09-13 - xxxxxxx - lavu 55.75.100 - hwcontext.h hwcontext_drm.h
+ Add AV_HWDEVICE_TYPE_DRM and implementation.
+
+2017-09-08 - xxxxxxx - lavfi 6.103.100 - buffersrc.h
+ Add av_buffersrc_close().
+
+2017-09-04 - xxxxxxx - lavc 57.105.100 - avcodec.h
+ Add AV_HWACCEL_CODEC_CAP_EXPERIMENTAL, replacing the deprecated
+ HWACCEL_CODEC_CAP_EXPERIMENTAL flag.
+
+2017-09-01 - xxxxxxx - lavf 57.81.100 - avio.h
+ Add avio_read_partial().
+
+2017-09-01 - xxxxxxx - lavf 57.80.100 / 57.11.0 - avio.h
+ Add avio_context_free(). From now on it must be used for freeing AVIOContext.
+
+2017-08-08 - xxxxxxx - lavu 55.74.100 - pixdesc.h
+ Add AV_PIX_FMT_FLAG_FLOAT pixel format flag.
+
+2017-08-08 - xxxxxxx - lavu 55.72.100 - imgutils.h
+ Add av_image_fill_black().
+
+2017-08-08 - xxxxxxx - lavu 55.71.100 - frame.h
+ Add av_frame_apply_cropping().
+
+2017-07-25 - 24de4fddca - lavu 55.69.100 - frame.h
+ Add AV_FRAME_DATA_ICC_PROFILE side data type.
+
+2017-xx-xx - xxxxxxx - lavc 57.100.100 - avcodec.h
+ DXVA2 and D3D11 hardware accelerated decoding now supports the new hwaccel API,
+ which can create the decoder context and allocate hardware frame automatically.
+ See AVCodecContext.hw_device_ctx and AVCodecContext.hw_frames_ctx. For D3D11,
+ the new AV_PIX_FMT_D3D11 pixfmt must be used with the new API.
+
+2017-xx-xx - xxxxxxx - lavu 56.67.100 - hwcontext.h
+ Add AV_HWDEVICE_TYPE_D3D11VA and AV_PIX_FMT_D3D11.
+
+2017-06-24 - xxxxxxx - lavf 57.75.100 - avio.h
+ Add AVIO_DATA_MARKER_FLUSH_POINT to signal preferred flush points to aviobuf.
+
+2017-06-14 - xxxxxxx - lavu 55.66.100 - hwcontext.h
+ av_hwframe_ctx_create_derived() now takes some AV_HWFRAME_MAP_* combination
+ as its flags argument (which was previously unused).
+
+2017-06-14 - xxxxxxx - lavc 57.99.100 - avcodec.h
+ Add AV_HWACCEL_FLAG_ALLOW_PROFILE_MISMATCH.
+
+2017-06-14 - xxxxxxx - lavu 55.65.100 - hwcontext.h
+ Add AV_HWDEVICE_TYPE_NONE, av_hwdevice_find_type_by_name(),
+ av_hwdevice_get_type_name() and av_hwdevice_iterate_types().
+
+2017-06-14 - xxxxxxx - lavu 55.64.100 - hwcontext.h
+ Add av_hwdevice_ctx_create_derived().
+
+2017-05-15 - xxxxxxxxxx - lavc 57.96.100 - avcodec.h
+ VideoToolbox hardware-accelerated decoding now supports the new hwaccel API,
+ which can create the decoder context and allocate hardware frames automatically.
+ See AVCodecContext.hw_device_ctx and AVCodecContext.hw_frames_ctx.
+
+2017-05-15 - xxxxxxxxxx - lavu 57.63.100 - hwcontext.h
+ Add AV_HWDEVICE_TYPE_VIDEOTOOLBOX and implementation.
+
+2017-xx-xx - xxxxxxx - lavc 57.95.100 / 57.31.0 - avcodec.h
Add AVCodecContext.apply_cropping to control whether cropping
is handled by libavcodec or the caller.
diff --cc libavcodec/avcodec.h
index 07d9f3e255,8d8fa594aa..b5bbc591ac
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@@ -2683,7 -2327,7 +2683,8 @@@ typedef struct AVCodecContext
* - encoding: unused
* - decoding: set by the caller before avcodec_open2().
*/
- attribute_deprecated int refcounted_frames;
++ attribute_deprecated
+ int refcounted_frames;
/* - encoding parameters */
float qcompress; ///< amount of qscale change between easy & hard scenes (0.0-1.0)
diff --cc libavcodec/version.h
index e1224752bd,2ade539c60..3008460b93
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -27,9 -27,9 +27,9 @@@
#include "libavutil/version.h"
-#define LIBAVCODEC_VERSION_MAJOR 57
-#define LIBAVCODEC_VERSION_MINOR 33
-#define LIBAVCODEC_VERSION_MICRO 0
+#define LIBAVCODEC_VERSION_MAJOR 57
+#define LIBAVCODEC_VERSION_MINOR 106
- #define LIBAVCODEC_VERSION_MICRO 101
++#define LIBAVCODEC_VERSION_MICRO 102
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
More information about the ffmpeg-cvslog
mailing list