Michael Niedermayer 1e49439f04 Merge commit '6656370b858329ca07a60a2de954d5e90daa0206'
* commit '6656370b858329ca07a60a2de954d5e90daa0206':
  avconv: set the "encoder" tag when transcoding

Conflicts:
	ffmpeg.c
	tests/ref/lavf/mkv
	tests/ref/seek/lavf-mkv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-18 21:31:51 +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
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