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
..
bmp
2013-04-30 11:53:12 +02:00
flm
2012-11-03 22:47:14 +01:00
gif
2014-04-28 15:20:38 +02:00
jpg
2013-04-30 11:53:12 +02:00
mkv
2014-05-01 08:03:51 +02:00
pam
2014-03-18 22:15:15 +01:00
pcx
2013-04-30 11:53:12 +02:00
png
2014-03-18 22:15:15 +01:00
ppm
2013-04-30 11:53:12 +02:00
sgi
2013-04-30 11:53:12 +02:00
tga
2013-04-30 11:53:12 +02:00
xbm
2012-04-09 17:21:35 +02:00