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
..
2015-03-02 11:09:08 +01:00
2015-03-13 23:23:01 +01:00
2015-03-10 01:00:38 +01:00
2014-10-24 15:30:12 +02:00
2015-02-10 11:28:53 +01:00
2015-02-20 12:17:14 +01:00
2014-12-02 03:02:30 +01:00