Michael Niedermayer 8334850a99 Merge commit '93afb6c98d' ... * commit '93afb6c98d': avconv: set output avg_frame_rate when known Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-05-18 14:38:36 +02:00
..
acodec	ff_put_wav_header: add flag to force WAVEFORMATEX	2014-04-30 16:41:35 +02:00
fate	Initialize riff and wav size fields to -1 instead of 0.	2014-05-03 22:21:00 +02:00
lavf	Merge commit '93afb6c98d'	2014-05-18 14:38:36 +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	Merge commit '6072184e70'	2014-05-01 17:40:14 +02:00
vsynth	mpeg12enc: always set closed gop flag on the first gop	2014-04-01 20:52:37 +02:00
vsynth1
vsynth2