RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
ffmpeg/tests
History
Michael Niedermayer bd4ebbbbed Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  proresdsp: fix function prototypes.
  prores-idct: fix overflow in c code.
  fate: update prores-alpha ref after changing pix_fmt to yuv444p10le
  prores: add missing feature warning for alpha
  mov: 10l: Terminate string with 0 not '0'
  mov: Prevent illegal writes when chapter titles are very short.
  prores: add appropriate -fix_fmt parameter to FATE command
  riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header
  lavc: add a flag-based error_recognition field to AVCodecContext and deprecate non-flag-based ER field
  lavc: rename deprecation symbol FF_API_VERY_AGGRESSIVE to FF_API_ER

Conflicts:
	libavcodec/avcodec.h
	libavformat/mov.c
	tests/fate/prores.mak
	tests/ref/acodec/g726
	tests/ref/fate/prores-alpha

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2011-10-14 22:24:00 +02:00
..
fate Merge remote-tracking branch 'qatar/master' 2011-10-14 22:24:00 +02:00
ref Merge remote-tracking branch 'qatar/master' 2011-10-14 22:24:00 +02:00
Makefile fate: enable the prores tests 2011-10-14 14:08:28 +02:00
audiogen.c
…
base64.c
…
codec-regression.sh reg tests: add g723.1 2011-10-10 02:58:18 +02:00
copycooker.sh build: remove unused copy regression test script 2011-07-07 22:47:24 +02: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-10-08 03:39:01 +02:00
fate.sh fate.sh: Ignore errors from rm command during cleanup. 2011-09-22 17:39:30 +02:00
fate2.mak rawdec: g722 is always 1 channel/16kHz 2011-09-17 06:42:17 +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
…
md5.sh
…
regression-funcs.sh Merge remote-tracking branch 'qatar/master' 2011-10-10 03:50:58 +02:00
rotozoom.c Merge remote branch 'qatar/master' 2011-05-12 04:51:24 +02:00
tiny_psnr.c tests: Remove disabled code. 2011-04-29 18:08:46 +02:00
videogen.c
…