diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 20:43:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 20:43:11 +0200 |
| commit | a561662fb7223cb98907744e03398848a0d362e1 (patch) | |
| tree | 23720ae7eb8ba20c8bc6c2db995b977d93433115 | |
| parent | 2bf87dcc2d3079ead09b250df6932c94ff13504c (diff) | |
| parent | ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d (diff) | |
Merge commit 'ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d'
* commit 'ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d':
avcodec: Undeprecate reordered_opaque
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/APIchanges | 3 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 1 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 8a78529bbb..606f9fffff 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2012-10-22 API changes, most recent first: +2014-08-xx - xxxxxxx - lavc 55.57.3 - avcodec.h + reordered_opaque is not going to be removed in the future. + 2014-08-02 - xxxxxxx - lavu 52.98.100 - pixelutils.h Add pixelutils API with SAD functions diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index efe94eeb6c..7d10d3d0f0 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2613,7 +2613,6 @@ typedef struct AVCodecContext { /** * opaque 64bit number (generally a PTS) that will be reordered and * output in AVFrame.reordered_opaque - * @deprecated in favor of pkt_pts * - encoding: unused * - decoding: Set by user. */ diff --git a/libavcodec/version.h b/libavcodec/version.h index 97d5074faa..a44826bb03 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MINOR 73 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |