From 4accd1fd1854486403108fa9a4288ff4da0ff82b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= <mans@mansr.com>
Date: Wed, 8 Feb 2006 01:11:48 +0000
Subject: [PATCH] bump version numbers and update docs for adts aac support

Originally committed as revision 4957 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 Changelog              | 1 +
 doc/ffmpeg-doc.texi    | 1 +
 libavcodec/avcodec.h   | 4 ++--
 libavformat/avformat.h | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Changelog b/Changelog
index 5b8dcdbaed..470b6dcf0b 100644
--- a/Changelog
+++ b/Changelog
@@ -34,6 +34,7 @@ version <next>
 - build system improvements
 - tabs and trailing whitespace removed from the codebase
 - AIFF/AIFF-C audio format, encoding and decoding
+- ADTS AAC file reading and writing
 
 version 0.4.9-pre1:
 
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index 95727caebb..340c768fc8 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -696,6 +696,7 @@ library:
 @item Electronic Arts Multimedia    @tab    @tab X
 @tab Used in various EA games; files have extensions like WVE and UV2.
 @item Nullsoft Video (NSV) format @tab    @tab X
+@item ADTS AAC audio @tab X @tab X
 @end multitable
 
 @code{X} means that encoding (resp. decoding) is supported.
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index e6f79533e1..c34fcf17ba 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -21,8 +21,8 @@ extern "C" {
 #define AV_STRINGIFY(s)         AV_TOSTRING(s)
 #define AV_TOSTRING(s) #s
 
-#define LIBAVCODEC_VERSION_INT  ((51<<16)+(1<<8)+0)
-#define LIBAVCODEC_VERSION      51.1.0
+#define LIBAVCODEC_VERSION_INT  ((51<<16)+(2<<8)+0)
+#define LIBAVCODEC_VERSION      51.2.0
 #define LIBAVCODEC_BUILD        LIBAVCODEC_VERSION_INT
 
 #define LIBAVCODEC_IDENT        "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index cb7346569d..e03f13185d 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -5,8 +5,8 @@
 extern "C" {
 #endif
 
-#define LIBAVFORMAT_VERSION_INT ((50<<16)+(0<<8)+0)
-#define LIBAVFORMAT_VERSION     50.0.0
+#define LIBAVFORMAT_VERSION_INT ((50<<16)+(1<<8)+0)
+#define LIBAVFORMAT_VERSION     50.1.0
 #define LIBAVFORMAT_BUILD       LIBAVFORMAT_VERSION_INT
 
 #define LIBAVFORMAT_IDENT       "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)