generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
8bc7fe4daf
ffmpeg/tests
History
Michael Niedermayer 8bc7fe4daf Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doxygen: misc consistency, spelling and wording fixes
  vcr1: drop unnecessary emms_c() calls without MMX code
  Replace all uses of av_close_input_file() with avformat_close_input().
  lavf: add avformat_close_input().
  lavf: deprecate av_close_input_stream().
  lavf doxy: add some basic demuxing documentation.
  lavf doxy: add some general lavf information.
  lavf doxy: add misc utility functions to a group.
  lavf doxy: add av_guess_codec/format to the encoding group.
  lavf doxy: add core functions to a doxy group.
  Add basic libavdevice documentation.
  lavc: convert error_recognition to err_recognition.
  avconv: update -map option help text
  x86: Require 7 registers for the cabac asm
  x86: bswap: remove test for bswap instruction
  bswap: make generic implementation more compiler-friendly
  h264: remove useless cast
  proresdec: fix decode_slice() prototype

Conflicts:
	configure
	doc/APIchanges
	ffprobe.c
	libavcodec/avcodec.h
	libavcodec/celp_math.h
	libavcodec/h264.c
	libavfilter/src_movie.c
	libavformat/anm.c
	libavformat/avformat.h
	libavformat/version.h
	libavutil/avstring.h
	libavutil/bswap.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-13 00:39:48 +01:00
..
fate Merge remote-tracking branch 'qatar/master' 2011-12-06 01:37:27 +01:00
ref Update seek reference for added metadata to lavf tests. 2011-12-12 21:54:52 +01:00
audiogen.c Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
base64.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
codec-regression.sh Merge remote-tracking branch 'qatar/master' 2011-12-11 01:05:33 +01:00
copycooker.sh build: remove unused copy regression test script 2011-07-07 22:47:24 +02:00
fate2.mak Merge remote-tracking branch 'qatar/master' 2011-12-11 01:05:33 +01:00
fate_config.sh.template tests: add a FATE configuration template 2011-11-24 00:33:20 +01:00
fate-run.sh Merge remote-tracking branch 'qatar/master' 2011-10-10 03:50:58 +02:00
fate-update.sh fate: remove stale fate-update.sh script 2011-03-19 13:35:52 +00:00
fate.mak Merge remote-tracking branch 'qatar/master' 2011-11-24 03:32:24 +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 lavf-regression: minimal metadata test. 2011-12-12 20:51:29 +01:00
lavfi-regression.sh Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925' 2011-08-13 02:56:08 +02:00
lena.pnm finished integrating rotozoom test in ffmpeg 2003-04-11 13:43:17 +00:00
Makefile fate: replace forgotten avconv by ffmpeg in vsynth / asynth stuff 2011-12-12 01:44:11 +01:00
md5.sh regtest: add openssl to md5 alternatives 2011-01-18 20:48:24 +00:00
regression-funcs.sh Run zmbv regression without md5sum. 2011-12-10 19:34:28 +01:00
rotozoom.c Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
tiny_psnr.c tests: Remove disabled code. 2011-04-29 18:08:46 +02:00
videogen.c Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00