Michael Niedermayer 8d86e7b495 Merge commit '060667195e' ... * commit '060667195e': hevc: rename some HEVC conformance streams Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-01-06 13:24:48 +01:00
..
acodec	avcodec: split mp2 encoder into float and fixed	2013-12-03 21:12:00 +01:00
fate	Merge commit '060667195e'	2014-01-06 13:24:48 +01:00
lavf	wtvenc: populate VIDEOINFOHEADER2	2013-12-23 15:55:54 +01:00
lavf-fate	lavf/mux: Don't write "encoder" metadata tag when bitexact is requested	2013-12-06 19:33:41 +01:00
seek	wtvenc: populate VIDEOINFOHEADER2	2013-12-23 15:55:54 +01:00
vsynth	fate: test version 3 of ffvhuff	2014-01-06 01:37:22 +01:00
vsynth1	Merge commit 'f919cc7df6'	2012-05-30 01:40:54 +02:00
vsynth2	Merge commit 'f919cc7df6'	2012-05-30 01:40:54 +02:00