From 70beebe35764f4dbf7623683326675bf5d8ee2e6 Mon Sep 17 00:00:00 2001 From: Nicolas George Date: Thu, 17 Apr 2014 09:36:44 +0200 Subject: [PATCH] lavc: minor bump and APIchanges for AVCodecDescriptor.mime_types. The minor bump also covers AV_CODEC_ID_BIN_DATA. --- doc/APIchanges | 3 +++ libavcodec/version.h | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 8d001cd6c4..a35501a2bd 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2012-10-22 API changes, most recent first: +2014-04-29 - 1bf6396 - lavc 55.60.100 - avcodec.h + Add AVCodecDescriptor.mime_types field. + 2014-04-29 - xxxxxxx - lavu 52.80.0 - hash.h Add av_hash_final_bin(), av_hash_final_hex() and av_hash_final_b64(). diff --git a/libavcodec/version.h b/libavcodec/version.h index 43a4cc4946..44ec052198 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,8 +29,8 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 55 -#define LIBAVCODEC_VERSION_MINOR 59 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MINOR 60 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \