1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
FFmpeg/libavformat
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-12-18 00:10:35 +01:00
2015-03-06 21:35:00 +01:00
2015-02-26 02:06:10 +01:00
2015-03-05 23:08:38 +01:00
2015-03-13 19:07:28 +01:00
2015-03-04 23:48:41 +01:00
2015-01-30 09:33:49 +00:00
2015-03-12 15:29:59 +00:00
2014-12-18 23:27:07 +01:00
2015-02-15 18:20:54 +01:00
2015-03-08 02:35:04 +00:00
2014-12-20 00:17:43 +01:00
2015-02-21 23:37:24 +02:00
2015-01-18 00:36:56 +01:00
2015-02-01 20:00:10 +01:00
2015-03-05 00:09:26 +01:00
2015-01-11 00:35:01 +01:00
2015-01-11 00:35:01 +01:00