1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
FFmpeg/tests/ref/vsynth1
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
..
amv
asv1
asv2
cljr cljrdec: improve scaling somewhat 2011-12-28 22:05:24 +01:00
dnxhd_720p
dnxhd_720p_10bit
dnxhd_720p_rd
dnxhd_1080i Merge remote-tracking branch 'qatar/master' 2012-01-11 02:44:43 +01:00
dv
dv50
dv_411
error
ffv1
flashsv
flashsv2
flv
h261
h263
h263p
huffyuv avienc: Fix rawvideo 32bit 2011-12-17 03:25:46 +01:00
jpeg2000
jpegls
ljpeg
mjpeg
mpeg
mpeg1b
mpeg2
mpeg2_422
mpeg2_idct_int
mpeg2_ilace
mpeg2_ivlc_qprd
mpeg2thread
mpeg2thread_ilace
mpeg4 Merge remote-tracking branch 'qatar/master' 2012-01-11 02:44:43 +01:00
mpeg4_adap
mpeg4_qpel
mpeg4_qprd
mpeg4adv
mpeg4nr
mpeg4thread
mpng Add tests for several encoders. 2011-12-05 20:05:44 +01:00
msmpeg4
msmpeg4v2
msvideo1
prores Merge remote-tracking branch 'qatar/master' 2012-01-11 02:44:43 +01:00
qtrle Merge remote-tracking branch 'qatar/master' 2012-01-11 02:44:43 +01:00
qtrlegray Merge remote-tracking branch 'qatar/master' 2012-01-11 02:44:43 +01:00
rc
rgb
roq
rv10
rv20
snow
snowll
svq1 Merge remote-tracking branch 'qatar/master' 2012-01-11 02:44:43 +01:00
v210 fate: Add v210 codec regression tests 2011-12-28 20:50:41 +01:00
vref
wmv1
wmv2
yuv avienc: Fix rawvideo 32bit 2011-12-17 03:25:46 +01:00
zlib Add tests for several encoders. 2011-12-05 20:05:44 +01:00
zmbv Run zmbv regression without md5sum. 2011-12-10 19:34:28 +01:00