RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 00:32:31 +00:00
Code Issues Projects Releases Wiki Activity
13e9a0fbfb
ffmpeg/tests
History
Michael Niedermayer ba57ef2972 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avconv: Fix spelling errors.
  aac: Only set sample rate and object type from ADTS if output hasn't been configured.
  aac: Set SBR and PS to unsignalled during headerless and ADTS initialization.
  aac: Only output configure if audio was found.
  avconv: save two levels of indentation in flush_encoders()
  avconv: factor flushing encoders out of output_packet().
  avconv: factor out initializing input streams.
  avconv: remove -intra option.
  avconv: reset streamid_map between output files.
  avconv: make timer_start a local var in transcode().
  avconv: cosmetics, move OutputStream.
  avconv: remove two unused macros.

Conflicts:
	avconv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-19 00:53:42 +02:00
..
fate fate: test more FFT etc sizes 2011-07-04 18:33:04 +01:00
ref Merge remote-tracking branch 'qatar/master' 2011-08-18 10:56:08 +02:00
audiogen.c
base64.c
codec-regression.sh Merge remote-tracking branch 'qatar/master' 2011-08-16 23:47:35 +02:00
copycooker.sh build: remove unused copy regression test script 2011-07-07 22:47:24 +02:00
fate2.mak ffmpeg: use new avformat_open_* API. 2011-07-14 18:22:36 +02:00
fate-run.sh fate: more cases of avconv that should be conditional 2011-08-16 03:38:00 +02:00
fate-update.sh
fate.mak Revert "avconv: use stream copy by default when possible." 2011-08-16 20:59:14 +02:00
fate.sh
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-08-19 00:53:42 +02:00
lavfi-regression.sh Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925' 2011-08-13 02:56:08 +02:00
lena.pnm
Makefile fate: allow specifying the tool to use for fate (avconv / ffmpeg) 2011-08-15 23:11:46 +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
tiny_psnr.c
videogen.c