ffmpeg/tests
Michael Niedermayer 8e576d5830 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  libavutil: add utility functions to simplify allocation of audio buffers.
  libavutil: add planar sample formats and av_sample_fmt_is_planar()
  avconv: fix segfault at EOF with delayed pictures
  pcmdec: remove unneeded resetting of samples pointer
  avconv: remove a now unused parameter from output_packet().
  avconv: formatting fixes in output_packet()
  avconv: declare some variables in blocks where they are used
  avconv: use the same behavior when decoding audio/video/subs
  bethsoftvideo: return proper consumed size for palette packets.
  cdg: skip packets that don't contain a cdg command.
  crcenc: add flags
  avconv: use vsync 0 for AVFMT_NOTIMESTAMPS formats.
  tiffenc: add a private option for selecting compression algorithm
  md5enc: add flags
  ARM: remove needless .text/.align directives

Conflicts:
	doc/APIchanges
	libavcodec/tiffenc.c
	libavutil/avutil.h
	libavutil/samplefmt.c
	libavutil/samplefmt.h
	tests/ref/fate/bethsoft-vid
	tests/ref/fate/cdgraphics
	tests/ref/fate/film-cvid-pcm-stereo-8bit
	tests/ref/fate/mpeg2-field-enc
	tests/ref/fate/nuv
	tests/ref/fate/tiertex-seq
	tests/ref/fate/tscc-32bit
	tests/ref/fate/vmnc-32bit

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-24 03:32:24 +01:00
..
fate Merge remote-tracking branch 'qatar/master' 2011-11-24 03:32:24 +01:00
ref Merge remote-tracking branch 'qatar/master' 2011-11-24 03:32:24 +01:00
Makefile fate: add --timeout=60 --contimeout=60 to fate-rsync 2011-11-07 15:13:16 +01:00
audiogen.c
base64.c
codec-regression.sh Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
copycooker.sh
fate-run.sh
fate-update.sh
fate.mak Merge remote-tracking branch 'qatar/master' 2011-11-24 03:32:24 +01:00
fate.sh
fate2.mak fate: fix mapchan 2011-11-06 03:01:01 +01:00
fate_config.sh.template tests: add a FATE configuration template 2011-11-24 00:33:20 +01:00
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh Merge remote-tracking branch 'qatar/master' 2011-11-19 02:00:06 +01:00
lavfi-regression.sh
lena.pnm
md5.sh
regression-funcs.sh
rotozoom.c
tiny_psnr.c
videogen.c