Michael Niedermayer 8334850a99 Merge commit '93afb6c98df876b15e3d911a9450ad55f92080ce' ...

* commit '93afb6c98df876b15e3d911a9450ad55f92080ce':
  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 '93afb6c98df876b15e3d911a9450ad55f92080ce'

2014-05-18 14:38:36 +02:00

lavf-fate

…

seek

Merge commit '6072184e702b4b631ac72f1b66b75e5f21e0ce2d'

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

…