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 0e7fc3cafe Merge remote-tracking branch 'qatar/master' 
* qatar/master: (22 commits)
  rv34: frame-level multi-threading
  mpegvideo: claim ownership of referenced pictures
  aacsbr: prevent out of bounds memcpy().
  ipmovie: fix pts for CODEC_ID_INTERPLAY_DPCM
  sierravmd: fix audio pts
  bethsoftvideo: Use bytestream2 functions to prevent buffer overreads.
  bmpenc: support for PIX_FMT_RGB444
  swscale: fix crash in fast_bilinear code when compiled with -mred-zone.
  swscale: specify register type.
  rv34: use get_bits_left()
  avconv: reinitialize the filtergraph on resolution change.
  vsrc_buffer: error on changing frame parameters.
  avconv: fix -copyinkf.
  fate: Update file checksums after the mov muxer change in a78dbada55
  movenc: Don't store a nonzero creation time if nothing was set by the caller
  bmpdec: support for rgb444 with bitfields compression
  rgb2rgb: allow conversion for <15 bpp
  doc: fix stray reference to FFmpeg
  v4l2: use C99 struct initializer
  v4l2: poll the file descriptor
  ...

Conflicts:
	avconv.c
	libavcodec/aacsbr.c
	libavcodec/bethsoftvideo.c
	libavcodec/kmvc.c
	libavdevice/v4l2.c
	libavfilter/vsrc_buffer.c
	libswscale/swscale_unscaled.c
	libswscale/x86/input.asm
	tests/ref/acodec/alac
	tests/ref/acodec/pcm_s16be
	tests/ref/acodec/pcm_s24be
	tests/ref/acodec/pcm_s32be
	tests/ref/acodec/pcm_s8
	tests/ref/lavf/mov
	tests/ref/vsynth1/dnxhd_1080i
	tests/ref/vsynth1/mpeg4
	tests/ref/vsynth1/qtrle
	tests/ref/vsynth1/svq1
	tests/ref/vsynth2/dnxhd_1080i
	tests/ref/vsynth2/mpeg4
	tests/ref/vsynth2/qtrle
	tests/ref/vsynth2/svq1

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2012-01-11 02:44:43 +01:00
..
fate fate: Disable fate-wmv8-x8intra 2012-01-10 07:15:18 +01:00
ref Merge remote-tracking branch 'qatar/master' 2012-01-11 02:44:43 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-01-01 00:07:31 +01:00
audiogen.c Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
base64.c
…
codec-regression.sh Merge remote-tracking branch 'qatar/master' 2012-01-05 02:03:12 +01:00
copycooker.sh
…
fate-run.sh fate: give stderr hint when a test fails. 2011-12-26 22:27:01 +01:00
fate-update.sh
…
fate.sh
…
fate_config.sh.template tests: add a FATE configuration template 2011-11-24 00:33:20 +01:00
ffserver-regression.sh
…
ffserver.conf
…
ffserver.regression.ref
…
lavf-regression.sh lavf-regression: minimal metadata test. 2011-12-12 20:51:29 +01:00
lavfi-regression.sh
…
lena.pnm
…
md5.sh
…
regression-funcs.sh Run zmbv regression without md5sum. 2011-12-10 19:34:28 +01:00
rotozoom.c Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
tiny_psnr.c
…
videogen.c Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00