From c99f9b0ac7b26db004217f176c85154151dd3d6a Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Sun, 14 Nov 2010 17:33:43 +0000 Subject: [PATCH] minor bump and Changelog entry for r25747 Originally committed as revision 25753 to svn://svn.ffmpeg.org/ffmpeg/trunk --- Changelog | 1 + libavcodec/avcodec.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 879db95b5b..b173e1c40f 100644 --- a/Changelog +++ b/Changelog @@ -54,6 +54,7 @@ version : - 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, \