diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-10-07 12:55:50 +0200 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-10-07 13:03:36 +0200 |
commit | 3f9137c57d2344d7613f134128235c18edcede95 (patch) | |
tree | cc4bfcc63bd6080c74d5cb526f286a1f4c96d4df /libavcodec/version.h | |
parent | 04a3577263782cd6d70722d4ae18d75fee03dbc4 (diff) | |
parent | 32c8359093d1ff4f45ed19518b449b3ac3769d27 (diff) |
Merge commit '32c8359093d1ff4f45ed19518b449b3ac3769d27'
* commit '32c8359093d1ff4f45ed19518b449b3ac3769d27':
lavc: export the timestamps when decoding in AVFrame.pts
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/version.h')
-rw-r--r-- | libavcodec/version.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index de7280f132..9c03364e9b 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,8 +28,8 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 57 -#define LIBAVCODEC_VERSION_MINOR 60 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MINOR 61 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |