summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog1
-rw-r--r--MAINTAINERS3
-rw-r--r--doc/general.texi2
-rw-r--r--libavcodec/avcodec.h2
4 files changed, 6 insertions, 2 deletions
diff --git a/Changelog b/Changelog
index 28ea900458..e4bfa6ec67 100644
--- a/Changelog
+++ b/Changelog
@@ -129,6 +129,7 @@ version <next>
- removed animated GIF decoder/demuxer
- D-Cinema audio muxer
- Electronic Arts TGV decoder
+- Apple Lossless Audio Codec (ALAC) encoder
version 0.4.9-pre1:
diff --git a/MAINTAINERS b/MAINTAINERS
index e6720b9a7c..b1d4637b78 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -106,8 +106,10 @@ Generic Parts:
Codecs:
4xm.c Michael Niedermayer
8bps.c Roberto Togni
+ 8svx.c Jaikrishnan Menon
aasc.c Kostya Shishkov
ac3* Justin Ruggles
+ alacenc.c Jaikrishnan Menon
apedec.c Kostya Shishkov
asv* Michael Niedermayer
atrac3* Benjamin Larsson
@@ -241,6 +243,7 @@ Muxers/Demuxers:
gxfenc.c Baptiste Coudurier
idcin.c Mike Melanson
idroq.c Mike Melanson
+ iff.c Jaikrishnan Menon
ipmovie.c Mike Melanson
img2.c Michael Niedermayer
libnut.c Oded Shimon
diff --git a/doc/general.texi b/doc/general.texi
index 0944654cc4..c536eac138 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -346,7 +346,7 @@ following image formats are supported:
@tab Supported through an external library.
@item AMV IMA ADPCM @tab @tab X
@tab Used in AMV files
-@item Apple lossless audio @tab @tab X
+@item Apple lossless audio @tab X @tab X
@tab QuickTime fourcc 'alac'
@item Apple MACE 3 @tab @tab X
@item Apple MACE 6 @tab @tab X
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 070569b845..29b500f711 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -30,7 +30,7 @@
#include "libavutil/avutil.h"
#define LIBAVCODEC_VERSION_MAJOR 51
-#define LIBAVCODEC_VERSION_MINOR 66
+#define LIBAVCODEC_VERSION_MINOR 67
#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \