1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-14 22:22:59 +02:00
FFmpeg/libavcodec
Michael Niedermayer 3a7ef8dc44 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>
2012-12-08 15:54:18 +01:00
..
2012-11-26 11:17:17 -05:00
2012-11-24 10:56:47 +00:00
2012-11-24 10:56:47 +00:00
2012-10-09 04:00:55 +02:00
2012-12-07 16:15:02 -05:00
2012-09-21 01:03:31 +02:00
2012-12-07 16:15:02 -05:00
2012-10-14 05:48:02 +02:00
2012-11-23 15:52:12 +01:00
2012-12-06 19:09:48 +00:00
2012-11-30 15:00:35 +00:00
2012-12-08 01:13:07 +00:00
2012-11-07 18:08:23 +01:00
2012-10-21 18:22:50 +02:00
2012-11-23 18:10:02 +01:00
2012-12-05 19:31:27 +01:00
2012-10-13 03:54:04 +02:00
2012-10-13 03:54:04 +02:00
2012-12-08 01:13:07 +00:00
2012-12-08 01:13:07 +00:00
2012-10-18 21:42:04 +02:00
2012-12-07 16:15:02 -05:00
2012-11-18 17:46:45 +00:00
2012-10-12 01:44:35 +02:00
2012-11-23 01:18:53 +01:00
2012-11-25 18:38:12 +01:00
2012-10-14 21:45:42 +02:00
2012-11-28 16:21:25 +00:00
2012-10-13 16:02:09 +00:00
2012-11-04 23:35:09 +00:00
2012-10-25 01:38:15 +02:00
2012-11-16 05:16:34 +01:00
2012-12-07 16:15:02 -05:00
2012-10-27 04:32:40 +02:00
2012-12-07 16:15:02 -05:00
2012-09-23 15:24:08 +02:00
2012-10-15 13:28:23 +00:00