1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/tests
Michael Niedermayer 7c1aba4f01 Merge remote-tracking branch 'qatar/master'
* qatar/master: (21 commits)
  fate: allow testing with libavfilter disabled
  x86: XOP/FMA4 CPU detection support
  ws_snd: misc cosmetic clean-ups
  ws_snd: remove the 2-bit ADPCM table and just subtract 2 instead.
  ws_snd: use memcpy() and memset() instead of loops
  ws_snd: use samples pointer for loop termination instead of a separate iterator variable.
  ws_snd: make sure number of channels is 1
  ws_snd: add some checks to prevent buffer overread or overwrite.
  ws_snd: decode to AV_SAMPLE_FMT_U8 instead of S16.
  flacdec: fix buffer size checking in get_metadata_size()
  rtp: Simplify ff_rtp_get_payload_type
  rtpenc: Add a payload type private option
  rtp: Correct ff_rtp_get_payload_type documentation
  avconv: replace all fprintf() by av_log().
  avconv: change av_log verbosity from ERROR to FATAL for fatal errors.
  cmdutils: replace fprintf() by av_log()
  avtools: parse loglevel before all the other options.
  oggdec: add support for Xiph's CELT codec
  sol: return error if av_get_packet() fails.
  cosmetics: reindent and pretty-print
  ...

Conflicts:
	avconv.c
	cmdutils.c
	libavcodec/avcodec.h
	libavcodec/version.h
	libavformat/oggparsecelt.c
	libavformat/utils.c
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-27 02:14:37 +02:00
..
fate Merge remote-tracking branch 'qatar/master' 2011-09-05 22:29:16 +02:00
ref regtests: amv video encoder test 2011-09-25 12:29:20 +02:00
audiogen.c
base64.c
codec-regression.sh ffmpeg: fix -b -ab mixes with -b overriding the audio bitrate 2011-09-26 21:04:23 +02:00
copycooker.sh build: remove unused copy regression test script 2011-07-07 22:47:24 +02:00
fate2.mak rawdec: g722 is always 1 channel/16kHz 2011-09-17 06:42:17 +02:00
fate-run.sh Merge remote-tracking branch 'qatar/master' 2011-09-05 22:29:16 +02:00
fate-update.sh
fate.mak fate: allow testing with libavfilter disabled 2011-09-27 00:05:51 +01:00
fate.sh fate.sh: Ignore errors from rm command during cleanup. 2011-09-22 17:39:30 +02:00
ffserver-regression.sh Remove the ffserver test. 2011-08-01 11:36:16 +02:00
ffserver.conf Remove the ffserver test. 2011-08-01 11:36:16 +02:00
ffserver.regression.ref Remove the ffserver test. 2011-08-01 11:36:16 +02:00
lavf-regression.sh Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
lavfi-regression.sh Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925' 2011-08-13 02:56:08 +02:00
lena.pnm
Makefile Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +02:00
md5.sh
regression-funcs.sh Revert "avconv: use stream copy by default when possible." 2011-08-16 20:59:14 +02:00
rotozoom.c Merge remote branch 'qatar/master' 2011-05-12 04:51:24 +02:00
tiny_psnr.c
videogen.c