diff options
| author | James Almer <jamrial@gmail.com> | 2017-09-26 16:38:55 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-09-26 16:42:18 -0300 |
| commit | b1cf151c4dfdbd049cd41863b4e0cde927585e17 (patch) | |
| tree | 478153ec007d7961fafe45d2222c4240db2a9448 /libavcodec | |
| parent | e7c91850531aae4c2e1bf1afc62fc1d910f8736c (diff) | |
| parent | 577326d430593a25456393a75212b95d1cd94131 (diff) | |
Merge commit '577326d430593a25456393a75212b95d1cd94131'
* commit '577326d430593a25456393a75212b95d1cd94131':
lavc: deprecate refcounted_frames field
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 1 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
2 files changed, 2 insertions, 1 deletions
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, \ |