Michael Niedermayer 5297003aa7 Merge commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123' ... * commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123': LucasArts SMUSH demuxer Conflicts: Changelog doc/general.texi libavformat/smush.c libavformat/version.h See: bef8fd7099 Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-04-06 23:29:47 +02:00
..
acodec	avcodec: split mp2 encoder into float and fixed	2013-12-03 21:12:00 +01:00
fate	Merge commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123'	2014-04-06 23:29:47 +02:00
lavf	mpeg12enc: always set closed gop flag on the first gop	2014-04-01 20:52:37 +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/wtvenc: pad judiciously when writing mpeg2 extradata	2014-03-30 06:22:54 +02:00
vsynth	mpeg12enc: always set closed gop flag on the first gop	2014-04-01 20:52:37 +02:00
vsynth1
vsynth2