aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJovan Zelincevic <jovan.zelincevic@imgtec.com>2015-07-20 13:36:22 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-22 23:25:33 +0200
commit9e3135f49e45ec6b26c5b7c3fea481bf85ad64d6 (patch)
tree9f492b489b0e365e6a8d15a613fe4c3b9590baf0
parenta9d986c2ced87d074ba307f9d6f213c5caae88ee (diff)
downloadffmpeg-9e3135f49e45ec6b26c5b7c3fea481bf85ad64d6.tar.gz
Edit documentation and versioning for the fixed point AAC decoder
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--Changelog1
-rw-r--r--doc/general.texi2
-rw-r--r--doc/mips.txt4
-rw-r--r--libavcodec/version.h2
4 files changed, 7 insertions, 2 deletions
diff --git a/Changelog b/Changelog
index e1b032d9ab..c50022dbb1 100644
--- a/Changelog
+++ b/Changelog
@@ -21,6 +21,7 @@ version <next>:
- Reverse filter
- Random filter
- deband filter
+- AAC fixed-point decoding
version 2.7:
diff --git a/doc/general.texi b/doc/general.texi
index 617be66dcc..a260e798c2 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -863,7 +863,7 @@ following image formats are supported:
@item Name @tab Encoding @tab Decoding @tab Comments
@item 8SVX exponential @tab @tab X
@item 8SVX fibonacci @tab @tab X
-@item AAC+ @tab E @tab X
+@item AAC+ @tab E @tab IX
@tab encoding supported through external library libaacplus
@item AAC @tab E @tab X
@tab encoding supported through external library libfaac and libvo-aacenc
diff --git a/doc/mips.txt b/doc/mips.txt
index 8c6779f67d..a84e89ae79 100644
--- a/doc/mips.txt
+++ b/doc/mips.txt
@@ -47,12 +47,16 @@ Files that have MIPS copyright notice in them:
* libavutil/mips/
float_dsp_mips.c
libm_mips.h
+ softfloat_tables.h
* libavcodec/
fft_fixed_32.c
fft_init_table.c
fft_table.h
mdct_fixed_32.c
* libavcodec/mips/
+ aacdec_fixed.c
+ aacsbr_fixed.c
+ aacsbr_template.c
aaccoder_mips.c
aacpsy_mips.h
ac3dsp_mips.c
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 399ee56862..aea988209b 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,7 +29,7 @@
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 56
-#define LIBAVCODEC_VERSION_MINOR 51
+#define LIBAVCODEC_VERSION_MINOR 52
#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \