Michael Niedermayer 2b570c9569 Merge commit '991362fab49b60d34d89b7b7d6dd00fbec3ce022' ... * commit '991362fab49b60d34d89b7b7d6dd00fbec3ce022': fate: add XBM tests Conflicts: tests/fate/image.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-03-28 05:50:38 +01:00
..
acodec	avcodec: split mp2 encoder into float and fixed	2013-12-03 21:12:00 +01:00
fate	Merge commit '991362fab49b60d34d89b7b7d6dd00fbec3ce022'	2014-03-28 05:50:38 +01:00
lavf	swscale/utils: Fix color range of gray16	2014-03-18 22:15:15 +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	avformat/movenc: only ommit encoder tag of the metadata for bitexact mode	2014-03-16 16:26:35 +01:00
vsynth	avformat/movenc: only ommit encoder tag of the metadata for bitexact mode	2014-03-16 16:26:35 +01:00
vsynth1
vsynth2