RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-17 21:14:47 +00:00
Code Issues Projects Releases Wiki Activity
944d049eaa
ffmpeg/tests
History
Michael Niedermayer 944d049eaa Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  movenc: Write chan atom for all audio tracks in mov mode movies.
  mpegtsenc: use avio_open_dyn_buf(), zero pointers after freeing
  doc/avconv: add some details about the transcoding process.
  avidec: make scale and rate unsigned.
  avconv: check output stream recording time before each frame returned from filters
  avconv: split selecting input file out of transcode().
  avconv: split checking for active outputs out of transcode().
  avfiltergraph: make some functions static.

Conflicts:
	ffmpeg.c
	libavfilter/avfiltergraph.c
	libavfilter/internal.h
	libavformat/mpegtsenc.c
	tests/ref/fate/acodec-alac
	tests/ref/fate/acodec-pcm-s16be
	tests/ref/fate/acodec-pcm-s24be
	tests/ref/fate/acodec-pcm-s32be
	tests/ref/fate/acodec-pcm-s8
	tests/ref/lavf/mov

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-04 22:59:32 +02:00
..
fate fate: enable fate-mapchan-6ch-extract-2-downmix-mono 2012-06-01 18:44:07 +02:00
ref Merge remote-tracking branch 'qatar/master' 2012-06-04 22:59:32 +02:00
asynth1.sw movenc: Decrease default chunk merge limit to 1mb. 2012-01-23 23:41:32 +01:00
audiogen.c Merge remote-tracking branch 'qatar/master' 2012-04-20 22:18:26 +02:00
base64.c Merge remote-tracking branch 'qatar/master' 2012-01-19 01:19:38 +01:00
copycooker.sh build: remove unused copy regression test script 2011-07-07 22:47:24 +02:00
fate_config.sh.template tests: add a FATE configuration template 2011-11-24 00:33:20 +01:00
fate-run.sh Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725' 2012-05-30 01:40:54 +02:00
fate-update.sh
fate-valgrind.supp Add a --valgrind configure option. 2012-01-21 12:04:46 +01:00
fate.sh fate: add support for specifying the shell used to run configure 2012-01-30 20:35:09 +01: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' 2012-05-30 04:38:32 +02:00
lavfi-regression.sh tests/lavfi: use do_lavfi_pixfmts for the pixdesctest test 2012-05-26 12:02:30 +02:00
lena.pnm
Makefile Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725' 2012-05-30 01:40:54 +02:00
md5.sh fate: try to fix 3rd md5 implementation 2012-06-01 04:16:23 +02:00
regression-funcs.sh fate: remove unused functions 2012-05-30 05:57:56 +02:00
rotozoom.c fate: dont freopen() stdout 2012-05-31 02:56:56 +02:00
tiny_psnr.c tiny_psnr: reindent after last commit. 2012-04-15 15:46:46 +02:00
utils.c Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725' 2012-05-30 01:40:54 +02:00
videogen.c fate: dont freopen() stdout 2012-05-31 02:56:56 +02:00