ffmpeg/tests/ref/lavf
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
..
aiff
alaw
asf Merge commit '6072184e702b4b631ac72f1b66b75e5f21e0ce2d' 2014-05-01 17:40:14 +02:00
ast
au
avi
bmp
caf
dpx
dv_fmt
ffm
flm
flv_fmt
gif
gxf
ircam
ismv
jpg
mkv Merge commit '6656370b858329ca07a60a2de954d5e90daa0206' 2014-05-18 21:31:51 +02:00
mmf
mov
mpg
mulaw
mxf
mxf_d10
nut Merge commit '6656370b858329ca07a60a2de954d5e90daa0206' 2014-05-18 21:31:51 +02:00
ogg Merge commit '6656370b858329ca07a60a2de954d5e90daa0206' 2014-05-18 21:31:51 +02:00
pam
pbmpipe
pcx
pgm
pgmpipe
pixfmt
png
ppm
ppmpipe
rm
rso
sgi
smjpeg
sox
sunrast
swf
tga
tiff
ts
voc
voc_s16
w64
wav
wtv Merge commit '93afb6c98df876b15e3d911a9450ad55f92080ce' 2014-05-18 14:38:36 +02:00
xbm
xwd
yuv4mpeg