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-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-04-05 03:32:11 +02:00
2014-04-05 03:32:11 +02:00
2014-04-01 05:18:26 +02:00
2014-04-04 04:00:11 +02:00
2014-03-26 04:20:52 +01:00
2014-03-31 01:11:16 +02:00
2014-04-06 16:40:27 +02:00
2014-04-01 13:43:44 +02:00
2014-03-16 23:29:51 +01:00
2014-04-04 04:00:11 +02:00
2014-03-29 18:13:15 +01:00
2014-03-27 23:57:51 +01:00