1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
Michael Niedermayer 3ead79eaa3 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  FATE: use updated reference for aac-latm_stereo_to_51
  avconv: use libavresample
  Add libavresample
  FATE: avoid channel mixing in lavf-dv_fmt

Conflicts:
	Changelog
	Makefile
	cmdutils.c
	configure
	doc/APIchanges
	ffmpeg.c
	tests/lavf-regression.sh
	tests/ref/lavf/dv_fmt
	tests/ref/seek/lavf_dv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-25 23:17:41 +02:00
..
asf
2012-04-05 06:03:10 +02:00
au
avi
2012-02-07 20:11:11 +01:00
bmp
dpx
2012-04-06 19:50:37 +02:00
jpg
mov
2012-04-06 19:50:37 +02:00
nut
2012-02-07 20:11:11 +01:00
ogg
2012-02-07 20:11:11 +01:00
pam
2012-03-14 15:34:50 +01:00
pcx
pgm
png
ppm
rm
2012-03-22 00:40:11 +01:00
sgi
2012-03-03 20:57:03 -05:00
swf
tga
ts
2012-03-22 00:40:11 +01:00
wav
xbm
2012-04-09 17:21:35 +02:00