Michael Niedermayer 682b28b410 Merge commit 'cfb4ee3097' ... * commit 'cfb4ee3097': fate: add a pngparser test Conflicts: tests/fate/image.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-12-17 18:55:15 +01:00
..
acodec	avcodec: split mp2 encoder into float and fixed	2013-12-03 21:12:00 +01:00
fate	Merge commit 'cfb4ee3097'	2013-12-17 18:55:15 +01:00
lavf	avcodec/imgconvert/get_color_type: fix type for PAL8	2013-10-02 19:59:10 +02: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/utils: inject audio skip side data before the side data merge code	2013-11-21 03:21:23 +01:00
vsynth	ljpegenc: deMpegEncContextize	2013-12-05 13:35:55 +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