summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2010-11-14 17:33:43 +0000
committerAurelien Jacobs <aurel@gnuage.org>2010-11-14 17:33:43 +0000
commitc99f9b0ac7b26db004217f176c85154151dd3d6a (patch)
treefb564d2463ad2199eacc13e6a51962b776c06e1c
parentc716f91757de7e798d4ad8659d0a0a61f380d566 (diff)
minor bump and Changelog entry for r25747
Originally committed as revision 25753 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--Changelog1
-rw-r--r--libavcodec/avcodec.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog b/Changelog
index 879db95b5b..b173e1c40f 100644
--- a/Changelog
+++ b/Changelog
@@ -54,6 +54,7 @@ version <next>:
- setpts filter added
- Win64 support for optimized asm functions
- MJPEG/AVI1 to JPEG/JFIF bitstream filter
+- ASS subtitle encoder and decoder
version 0.6:
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index eee0467a90..bff9477986 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -32,7 +32,7 @@
#include "libavutil/cpu.h"
#define LIBAVCODEC_VERSION_MAJOR 52
-#define LIBAVCODEC_VERSION_MINOR 95
+#define LIBAVCODEC_VERSION_MINOR 96
#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \