minor bump and Changelog entry for r25747

Originally committed as revision 25753 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago · c99f9b0ac7
parent c716f91757
commit c99f9b0ac7
2 changed files with 2 additions and 1 deletions
--- a/1
+++ b/1
@ -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:
--- 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, \