[FFmpeg-cvslog] r25753 - in trunk: Changelog libavcodec/avcodec.h

[aurel]

Author: aurel
Date: Sun Nov 14 18:33:43 2010
New Revision: 25753

Log:
minor bump and Changelog entry for r25747

Modified:
   trunk/Changelog
   trunk/libavcodec/avcodec.h

Modified: trunk/Changelog
==============================================================================
--- trunk/Changelog	Sun Nov 14 18:31:06 2010	(r25752)
+++ trunk/Changelog	Sun Nov 14 18:33:43 2010	(r25753)
@@ -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:

Modified: trunk/libavcodec/avcodec.h
==============================================================================
--- trunk/libavcodec/avcodec.h	Sun Nov 14 18:31:06 2010	(r25752)
+++ trunk/libavcodec/avcodec.h	Sun Nov 14 18:33:43 2010	(r25753)
@@ -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, \