Merge commit '57231e4d5b467833fb289439cd35a92513bb55c1'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Dec 2012 14:53:56 +0000 (15:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Dec 2012 14:54:18 +0000 (15:54 +0100)
commit3a7ef8dc44abe3b8f58cbf69acfd361287c12f2b
tree039f7c840093da78f566977fd6def1139ddb5839
parent64e174e8b8975e36827a84c6d9adb6f161bc734f
parent57231e4d5b467833fb289439cd35a92513bb55c1
Merge commit '57231e4d5b467833fb289439cd35a92513bb55c1'

* commit '57231e4d5b467833fb289439cd35a92513bb55c1':
  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
libavcodec/tak.c
libavcodec/tak.h
libavcodec/tak_parser.c
libavcodec/utils.c