Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas George <george@nsup.org>2014-04-17 11:36:44 +0400
committerNicolas George <george@nsup.org>2014-04-29 15:25:52 +0400
commit70beebe35764f4dbf7623683326675bf5d8ee2e6 (patch)
tree8ac9130f61aa7440627cddea559f2c4677333913 /libavcodec/version.h
parent1bf63964985e4964d812c1516379707a0868ecb6 (diff)
lavc: minor bump and APIchanges for AVCodecDescriptor.mime_types.
The minor bump also covers AV_CODEC_ID_BIN_DATA.
Diffstat (limited to 'libavcodec/version.h')
-rw-r--r--libavcodec/version.h4
1 files changed, 2 insertions, 2 deletions
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, \