Michael Niedermayer e1f37c48e5 Merge commit '247e370e2a913db52ca079b347a174c8d393b171'
* commit '247e370e2a913db52ca079b347a174c8d393b171':
  TDSC decoder

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/version.h
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-13 23:23:01 +01:00
..
2014-06-05 12:20:44 +02:00
2015-03-02 11:09:08 +01:00
2014-04-19 05:06:06 +02:00
2014-01-15 21:20:47 +01:00
2015-02-26 14:20:03 +01:00
2013-07-29 19:20:27 +02:00
2014-04-24 22:01:33 +01:00
2014-10-22 23:12:38 +02:00
2015-02-11 22:44:06 +01:00
2014-09-02 14:41:13 -07:00