diff --git a/doc/APIchanges b/doc/APIchanges index 7605bc40dd23c2196c4fc45be936461b5a0c20fa..3d25e012dd50dd237839c1a2cbe385d6ed7b8875 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,6 +13,11 @@ libavutil: 2012-10-22 API changes, most recent first: +2013-12-xx - xxxxxxx - lavc 55.28.1 - avcodec.h + av_frame_alloc(), av_frame_unref() and av_frame_free() now can and should be + used instead of avcodec_alloc_frame(), avcodec_get_frame_defaults() and + avcodec_free_frame() respectively. The latter three functions are deprecated. + 2013-11-xx - xxxxxxx- - lavu 52.20.0 - frame.h Add AV_FRAME_DATA_STEREO3D value to the AVFrameSideDataType enum and stereo3d.h API, that identify codec-independent stereo3d information. diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 7836ae2f97a4c6a9b4e7be85990d06cdb99b81cc..0e6ac0524e7e54c32cb16712edfb36f16cb4828f 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3103,16 +3103,17 @@ int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src); */ attribute_deprecated AVFrame *avcodec_alloc_frame(void); -#endif /** * Set the fields of the given AVFrame to default values. * * @param frame The AVFrame of which the fields should be set to default values. + * + * @deprecated use av_frame_unref() */ +attribute_deprecated void avcodec_get_frame_defaults(AVFrame *frame); -#if FF_API_AVFRAME_LAVC /** * Free the frame and any dynamically allocated objects in it, * e.g. extended_data. diff --git a/libavcodec/utils.c b/libavcodec/utils.c index e078a11408399ebe4a3d099c55942de2e67f74fd..1fa9cb88d285a6e6971167290d63a3e1b0ea7703 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -801,6 +801,7 @@ enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *s, const en return fmt[0]; } +#if FF_API_AVFRAME_LAVC void avcodec_get_frame_defaults(AVFrame *frame) { if (frame->extended_data != frame->data) @@ -815,7 +816,6 @@ void avcodec_get_frame_defaults(AVFrame *frame) frame->extended_data = frame->data; } -#if FF_API_AVFRAME_LAVC AVFrame *avcodec_alloc_frame(void) { AVFrame *frame = av_mallocz(sizeof(AVFrame)); diff --git a/libavcodec/version.h b/libavcodec/version.h index c828dc8e6120c0fb8c9dc5c1ef70ede4ea9d7874..2c3f2f214a12eb2e43674c5e1e5134320104306f 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,7 +28,7 @@ #define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MINOR 28 -#define LIBAVCODEC_VERSION_MICRO 0 +#define LIBAVCODEC_VERSION_MICRO 1 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \