Michael Niedermayer bb5657fabf Merge commit '6072184e70' ... * commit '6072184e70': asfenc: use codec descriptors instead of AVCodecs to write codec info Conflicts: tests/ref/lavf/asf tests/ref/seek/lavf-asf Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-05-01 17:40:14 +02:00
..
acodec	ff_put_wav_header: add flag to force WAVEFORMATEX	2014-04-30 16:41:35 +02:00
fate	fate/hevc: update with new sequences from jctvc(cherry picked from commit de6d9c586bd3852dfbe629a88ccc8c0f0a2bfcbb)	2014-04-30 21:51:58 +02:00
lavf	Merge commit '6072184e70'	2014-05-01 17:40:14 +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	Merge commit 'f919cc7df6'	2012-05-30 01:40:54 +02:00
vsynth2	Merge commit 'f919cc7df6'	2012-05-30 01:40:54 +02:00