generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
fadfbb354b
ffmpeg/tests
History
Michael Niedermayer d6e87190fd Merge commit 'a25d912dca9cd553440167e0476c47581359c0fc' 
* commit 'a25d912dca9cd553440167e0476c47581359c0fc':
  avcodec_encode_audio(): fix invalid free
  pcm-mpeg: correct bitrate calculation
  ffv1: K&R formatting cosmetics
  fate: Add rangecoder test
  network: #include stdint.h in network.h
  nut: export codec_tag provided by rawvideo
  avserver: move avserver-specific code from ffmdec.c to avserver.c

Conflicts:
	ffserver.c
	libavcodec/ffv1.c
	libavformat/ffmdec.c
	libavformat/nutenc.c
	tests/ref/lavfi/crop
	tests/ref/lavfi/crop_scale
	tests/ref/lavfi/crop_scale_vflip
	tests/ref/lavfi/crop_vflip
	tests/ref/lavfi/null
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_crop
	tests/ref/lavfi/pixfmts_hflip
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_pad
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip
	tests/ref/lavfi/scale200
	tests/ref/lavfi/scale500
	tests/ref/lavfi/vflip
	tests/ref/lavfi/vflip_crop
	tests/ref/lavfi/vflip_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-17 14:17:55 +02:00
..
fate Merge commit 'a25d912dca9cd553440167e0476c47581359c0fc' 2012-10-17 14:17:55 +02:00
ref msvideo1enc: fix interframe encoding 2012-10-16 02:22:27 +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-07-29 02:16:26 +02:00
base64.c Merge remote-tracking branch 'qatar/master' 2012-01-19 01:19:38 +01:00
copycooker.sh
fate-run.sh Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
fate-update.sh
fate-valgrind.supp Add a --valgrind configure option. 2012-01-21 12:04:46 +01:00
fate.sh Merge remote-tracking branch 'qatar/master' 2012-09-06 16:23:17 +02:00
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh fate: add faststart regression test. 2012-09-27 08:59:37 +02:00
lavfi-regression.sh fate: add vf_idet filter to lavfi regression tests 2012-10-11 02:21:28 +02:00
lena.pnm
Makefile Merge commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f' 2012-10-10 13:01:27 +02:00
md5.sh Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b' 2012-10-16 14:04:14 +02:00
regression-funcs.sh fate: remove unused functions 2012-05-30 05:57:56 +02:00
rotozoom.c Merge remote-tracking branch 'qatar/master' 2012-06-07 21:45:52 +02:00
test.ffmeta fate/ffprobe: add some stream metadata. 2012-10-08 11:03:27 +02:00
tiny_psnr.c Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b' 2012-10-16 14:04:14 +02:00
utils.c Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725' 2012-05-30 01:40:54 +02:00
videogen.c Merge remote-tracking branch 'qatar/master' 2012-06-07 21:45:52 +02:00