Michael Niedermayer e1f37c48e5 Merge commit '247e370e2a' ... * commit '247e370e2a': 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
..
acodec	tests/fate: Add S302M test	2015-03-02 11:09:08 +01:00
fate	Merge commit '247e370e2a'	2015-03-13 23:23:01 +01:00
lavf	libavformat/mxfenc: write package name metadata	2015-03-10 01:00:38 +01:00
lavf-fate
seek
vsynth	avformat/movenc: Move avid DNxHD padding to the correct spot	2015-02-20 12:17:14 +01:00
vsynth1
vsynth_lena