-
Michael Niedermayer authored
* 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>
3a7ef8dc