Merge commit '57231e4d'

* commit '57231e4d':
  tak: demuxer, parser, and decoder

Not merged as requested by Author and Maintainer of tak in FFmpeg.
I just merged a few typo fixes and minor cosmetic improvments.

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/tak.c
	libavcodec/tak.h
	libavcodec/tak_parser.c
	libavcodec/takdec.c
	libavcodec/version.h
	libavformat/takdec.c
	libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/avcodec.h

@@ -433,6 +433,7 @@ enum AVCodecID {
     AV_CODEC_ID_ILBC,
     AV_CODEC_ID_OPUS_DEPRECATED,
     AV_CODEC_ID_COMFORT_NOISE,
+    AV_CODEC_ID_TAK_DEPRECATED,
     AV_CODEC_ID_FFWAVESYNTH = MKBETAG('F','F','W','S'),
     AV_CODEC_ID_8SVX_RAW    = MKBETAG('8','S','V','X'),
     AV_CODEC_ID_SONIC       = MKBETAG('S','O','N','C'),

libavcodec/tak.c

@@ -19,10 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "tak.h"
+#include "libavutil/bswap.h"
 #include "libavutil/crc.h"
 #include "libavutil/intreadwrite.h"
-#include "libavutil/bswap.h"
+#include "tak.h"
 
 static const int64_t tak_channel_layouts[] = {
     0,

libavcodec/tak.h

@@ -27,6 +27,8 @@
 #ifndef AVCODEC_TAK_H
 #define AVCODEC_TAK_H
 
+#include <stdint.h>
+
 #define BITSTREAM_READER_LE
 #include "get_bits.h"
 #include "avcodec.h"
@@ -132,9 +134,9 @@ void ff_tak_init_crc(void);
 int ff_tak_check_crc(const uint8_t *buf, unsigned int buf_size);
 
 /**
- * Parse the Streaminfo metadata block
+ * Parse the Streaminfo metadata block.
  * @param[in]  gb pointer to GetBitContext
- * @param[out] s       where parsed information is stored
+ * @param[out] s  storage for parsed information
  */
 void avpriv_tak_parse_streaminfo(GetBitContext *gb, TAKStreamInfo *s);
 

libavcodec/utils.c

@@ -1917,6 +1917,7 @@ static enum AVCodecID remap_deprecated_codec_id(enum AVCodecID id)
         //last major bump but will fill up again over time, please don't remove it
 //         case AV_CODEC_ID_UTVIDEO_DEPRECATED: return AV_CODEC_ID_UTVIDEO;
         case AV_CODEC_ID_OPUS_DEPRECATED: return AV_CODEC_ID_OPUS;
+        case AV_CODEC_ID_TAK_DEPRECATED : return AV_CODEC_ID_TAK;
         default                         : return id;
     }
 }