ffmpeg/tests
Michael Niedermayer e79c3858b3 Merge commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8'
* commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8':
  dv: use AVStream.index instead of abusing AVStream.id
  lavfi: add ashowinfo filter
  avcodec: Add a RFC 3389 comfort noise codec
  lpc: Add a function for calculating reflection coefficients from samples
  lpc: Add a function for calculating reflection coefficients from autocorrelation coefficients
  lavr: document upper bound on number of output samples.
  lavr: add general API usage doxy
  indeo3: remove duplicate capabilities line.
  fate: ac3: Add dependencies

Conflicts:
	Changelog
	doc/filters.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/codec_desc.c
	libavcodec/version.h
	libavfilter/Makefile
	libavfilter/af_ashowinfo.c
	libavfilter/allfilters.c
	libavfilter/version.h
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30 14:40:22 +01:00
..
fate Merge commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8' 2012-10-30 14:40:22 +01:00
ref fate: make sure the global sws flags are set to be bitexact for scalenorm 2012-10-28 13:05:35 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-10-23 15:12:20 +02:00
asynth1.sw
audiogen.c
base64.c
copycooker.sh
fate-run.sh
fate-update.sh
fate-valgrind.supp
fate.sh Merge remote-tracking branch 'qatar/master' 2012-09-06 16:23:17 +02:00
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh fate: add faststart regression test. 2012-09-27 08:59:37 +02:00
lavfi-regression.sh lavfi/scale: accept named options, make parsing more robust 2012-10-29 17:39:26 +01:00
lena.pnm
md5.sh Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b' 2012-10-16 14:04:14 +02:00
regression-funcs.sh
rotozoom.c
test.ffmeta fate/ffprobe: add some stream metadata. 2012-10-08 11:03:27 +02:00
tiny_psnr.c Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b' 2012-10-16 14:04:14 +02:00
utils.c
videogen.c