ffmpeg/tests/ref
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
..
acodec
fate Merge commit '247e370e2a913db52ca079b347a174c8d393b171' 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
vsynth1
vsynth_lena