ffmpeg/tests/ref
Michael Niedermayer bae053fca4 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  fate: make compare() function compatible with POSIX bc
  Update Janne's email address.
  APIchanges: Replace Subversion revision numbers by Git hashes.
  bytestream: Eliminate one level of pointless macro indirection.
  xwd: convert to bytestream2.
  vqavideo: port to bytestream2 API
  Read preset files with suffix .avpreset
  prores: allow user to set fixed quantiser
  lavf: remove some disabled code.
  lavf: only set average frame rate for video.
  lavf: remove a pointless check.
  avcodec: add XBM encoder

Conflicts:
	Changelog
	cmdutils.c
	cmdutils.h
	doc/APIchanges
	libavcodec/Makefile
	libavcodec/avcodec.h
	libavcodec/version.h
	libavcodec/vqavideo.c
	libavformat/img2enc.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-18 23:39:42 +01:00
..
acodec Merge remote-tracking branch 'qatar/master' 2012-03-17 23:16:05 +01:00
fate Merge remote-tracking branch 'qatar/master' 2012-03-18 23:39:42 +01:00
lavf Merge remote-tracking branch 'qatar/master' 2012-03-15 01:27:10 +01:00
lavf-fate lavf-fate-ogg_vp3: Try -idct auto instead of -idct simple. 2012-02-18 21:45:07 +01:00
lavfi fate: disable deshake test as it isnt binary identical across archs. 2012-02-29 07:03:04 +01:00
seek Merge remote-tracking branch 'qatar/master' 2012-03-17 23:16:05 +01:00
vsynth1 Merge remote-tracking branch 'qatar/master' 2012-03-15 01:27:10 +01:00
vsynth2 Merge remote-tracking branch 'qatar/master' 2012-03-15 01:27:10 +01:00