RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
ffmpeg/tests/ref
History
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
..
acodec Merge remote-tracking branch 'qatar/master' 2012-04-20 22:18:26 +02:00
fate parseutils: add av_parse_time() test. 2012-04-23 14:39:01 +02:00
lavf Merge remote-tracking branch 'qatar/master' 2012-04-25 23:17:41 +02:00
lavf-fate latmenc: copy pce config from proper location. 2012-04-12 20:28:37 +02:00
lavfi vf_thumbnail: colorspace changed from yv12 to rgb 2012-04-17 04:06:27 +02:00
seek FATE: avoid channel mixing in lavf-dv_fmt 2012-04-24 15:55:45 -04:00
vsynth1 Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29' 2012-04-17 04:03:50 +02:00
vsynth2 Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29' 2012-04-17 04:03:50 +02:00