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 a7758884db Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rtp: factorize  dynamic payload type fallback
  flvdec: Ignore the index if it's from a creator known to be different
  cmdutils: move grow_array out of #if CONFIG_AVFILTER
  avconv: actually set InputFile.rate_emu
  ratecontrol: update last_qscale_for sooner
  Fix unnecessary shift with 9/10bit vertical scaling
  prores: mark prores as intra-only in libavformat/utils.c:is_intra_only()
  prores: return more meaningful error values
  prores: improve error message wording
  prores: cosmetics: prettyprinting, drop useless parentheses
  prores: lowercase AVCodec name entry

Conflicts:
	cmdutils.c
	libavcodec/proresdec_lgpl.c
	tests/ref/lavfi/pixfmts_scale

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2011-09-24 01:03:07 +02:00
..
fate Merge remote-tracking branch 'qatar/master' 2011-09-05 22:29:16 +02:00
ref Merge remote-tracking branch 'qatar/master' 2011-09-24 01:03:07 +02:00
Makefile fate: Switch default tool to test from avconv to ffmpeg 2011-08-30 18:16:03 +02:00
audiogen.c
…
base64.c
…
codec-regression.sh regtests: add a flashsv2 decoder test limited to keyframes 2011-09-20 01:12:42 +02:00
copycooker.sh
…
fate-run.sh Merge remote-tracking branch 'qatar/master' 2011-09-05 22:29:16 +02:00
fate-update.sh
…
fate.mak avconv: move start_time, recording_time and input_ts_offset to options context 2011-09-04 13:12:00 +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 Revert "avconv: use stream copy by default when possible." 2011-08-16 20:59:14 +02:00
rotozoom.c
…
tiny_psnr.c
…
videogen.c
…