ffmpeg/tests/ref/lavf
Michael Niedermayer 8334850a99 Merge commit '93afb6c98df876b15e3d911a9450ad55f92080ce'
* commit '93afb6c98df876b15e3d911a9450ad55f92080ce':
  avconv: set output avg_frame_rate when known

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-18 14:38:36 +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
mmf
mov
mpg
mulaw
mxf
mxf_d10
nut
ogg
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