aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2010-11-14 17:31:06 +0000
committerAurelien Jacobs <aurel@gnuage.org>2010-11-14 17:31:06 +0000
commitc716f91757de7e798d4ad8659d0a0a61f380d566 (patch)
tree1b8ad2795e98790c0c05f6ae5815fca6e8d1b75b
parent86abf868ec28b84efe014dbf5566bcff69382cc1 (diff)
downloadffmpeg-c716f91757de7e798d4ad8659d0a0a61f380d566.tar.gz
minor bump and APIchanges for r25745
Originally committed as revision 25752 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--doc/APIchanges4
-rw-r--r--libavcodec/avcodec.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/APIchanges b/doc/APIchanges
index d3a27dd46b..b6806f8b5e 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -13,6 +13,10 @@ libavutil: 2009-03-08
API changes, most recent first:
+2010-11-13 - r25745 - lavc 52.95.0 - AVCodecContext
+ Add AVCodecContext.subtitle_header and AVCodecContext.subtitle_header_size
+ fields.
+
2010-11-13 - r25740 - lavfi 1.62.0 - avfiltergraph.h
Make avfiltergraph.h public.
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index c523cd6ced..eee0467a90 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -32,8 +32,8 @@
#include "libavutil/cpu.h"
#define LIBAVCODEC_VERSION_MAJOR 52
-#define LIBAVCODEC_VERSION_MINOR 94
-#define LIBAVCODEC_VERSION_MICRO 4
+#define LIBAVCODEC_VERSION_MINOR 95
+#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \