FFmpeg/tests/ref
Michael Niedermayer bb5657fabf Merge commit '6072184e702b4b631ac72f1b66b75e5f21e0ce2d'
* commit '6072184e702b4b631ac72f1b66b75e5f21e0ce2d':
  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 '6072184e702b4b631ac72f1b66b75e5f21e0ce2d' 2014-05-01 17:40:14 +02:00
lavf-fate
seek Merge commit '6072184e702b4b631ac72f1b66b75e5f21e0ce2d' 2014-05-01 17:40:14 +02:00
vsynth
vsynth1
vsynth2