Michael Niedermayer d8cfa98358 Merge commit '58b619c8a226cc4564ad5af291bc99a04f89ee56' ...

* commit '58b619c8a226cc4564ad5af291bc99a04f89ee56':
  wav muxer: write metadata

Conflicts:
	Changelog
	libavformat/version.h

Merged-by: Michael Niedermayer <[email protected]>

2012-10-17 15:16:23 +02:00

..

fate

Merge commit '58b619c8a226cc4564ad5af291bc99a04f89ee56'

2012-10-17 15:16:23 +02:00

lavf

Merge commit '58b619c8a226cc4564ad5af291bc99a04f89ee56'

2012-10-17 15:16:23 +02:00

lavf-fate

mp3enc: add lame tag with start padding info

2012-07-14 17:20:22 +02:00

lavfi

nut: export codec_tag provided by rawvideo

2012-10-16 15:26:31 +02:00

seek

Merge commit '58b619c8a226cc4564ad5af291bc99a04f89ee56'

2012-10-17 15:16:23 +02:00

vsynth1

Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'

2012-05-30 01:40:54 +02:00

vsynth2

Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'

2012-05-30 01:40:54 +02:00