ffmpeg/libavcodec
Michael Niedermayer 881f4e8d34 Merge commit 'a420ccd4f2a011887451a7d5e1bebba4fd7c40e2'
* commit 'a420ccd4f2a011887451a7d5e1bebba4fd7c40e2':
  LucasArts SMUSH SANM video decoder

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/sanm.c
	libavcodec/version.h

See: 69254f46286099588514454f60fad12f6e51b2cd and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-06 22:19:16 +02:00
..
2014-04-06 16:40:27 +02:00
2014-02-17 20:50:33 +01:00
2014-01-09 19:33:07 +01:00
2013-10-03 23:00:09 +02:00
2013-12-15 16:53:32 +01:00
2013-11-16 17:43:05 +01:00
2013-11-16 12:48:25 +01:00
2013-10-06 20:12:37 +00:00
2013-11-16 17:43:36 +01:00
2014-04-01 00:10:15 +02:00
2014-04-01 00:10:15 +02:00
2014-04-01 00:10:15 +02:00
2014-04-01 00:10:15 +02:00
2014-04-01 00:10:15 +02:00
2014-03-22 03:12:18 +01:00
2014-02-07 19:32:16 +00:00
2014-04-05 03:32:11 +02:00
2014-04-05 03:32:11 +02:00
2014-04-01 05:18:26 +02:00
2014-02-06 02:51:19 +01:00
2013-10-18 16:46:08 +02:00
2014-04-04 04:00:11 +02:00
2013-11-26 13:22:01 +01:00
2014-03-26 04:20:52 +01:00
2013-10-13 21:48:28 +02:00
2014-03-31 01:11:16 +02:00
2013-10-28 23:54:28 +01:00
2013-11-21 20:53:06 +01:00
2014-01-02 22:07:09 +01:00
2014-04-06 16:40:27 +02:00
2014-04-01 13:43:44 +02:00
2013-11-21 20:57:20 +01:00
2013-09-21 16:59:13 +02:00
2013-12-31 12:19:59 +01:00
2014-01-10 17:08:04 +01:00
2013-12-31 12:19:59 +01:00
2014-01-31 18:34:14 +01:00
2013-12-09 08:41:20 +01:00
2013-12-09 08:41:20 +01:00
2014-02-21 16:57:26 -03:00
2014-02-21 16:57:26 -03:00
2013-11-16 12:49:18 +01:00
2014-02-10 21:45:55 +01:00
2014-02-10 21:45:55 +01:00
2014-03-16 23:29:51 +01:00
2014-01-04 04:16:46 +01:00
2013-09-21 16:59:13 +02:00
2013-12-10 16:18:51 +01:00
2013-10-22 19:55:47 +02:00
2013-12-22 14:59:31 +01:00
2014-01-27 20:36:42 +01:00
2014-04-04 04:00:11 +02:00
2013-11-15 10:16:28 +01:00
2013-11-15 10:16:28 +01:00
2014-03-29 18:13:15 +01:00
2014-03-27 23:57:51 +01:00
2013-12-22 22:03:47 +01:00
2013-12-22 22:03:47 +01:00