[FFmpeg-cvslog] Merge commit '57231e4d5b467833fb289439cd35a92513bb55c1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec  8 15:53:56 2012 +0100| [3a7ef8dc44abe3b8f58cbf69acfd361287c12f2b] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3a7ef8dc44abe3b8f58cbf69acfd361287c12f2b
---