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
..
ast
au
avi
bmp
caf
dpx
flm
gif
2014-04-28 15:20:38 +02:00
jpg
mkv
2014-05-01 08:03:51 +02:00
mmf
nut
ogg
pam
2014-03-18 22:15:15 +01:00
pcx
pgm
png
2014-03-18 22:15:15 +01:00
ppm
rm
rso
sgi
sox
swf
tga
voc
xbm
xwd