RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-03 13:32:10 +00:00
Code Issues Projects Releases Wiki Activity
0e7fc3cafe
ffmpeg/tests/ref/lavf
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 a78dbada55d6
  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
..
aiff Place regression test output files in subdirs per family 2010-03-02 21:41:52 +00:00
alaw Place regression test output files in subdirs per family 2010-03-02 21:41:52 +00:00
asf lavf-regression: minimal metadata test. 2011-12-12 20:51:29 +01:00
au Place regression test output files in subdirs per family 2010-03-02 21:41:52 +00:00
avi lavf-regression: minimal metadata test. 2011-12-12 20:51:29 +01:00
bmp regtest: place image sequence outputs in separate directories 2010-03-07 19:25:58 +00:00
caf Add caf format regression test. 2011-12-11 09:45:17 +01:00
dv_fmt rematrix: dont use floats for int16 code. 2011-09-19 09:25:50 +02:00
ffm Merge remote-tracking branch 'qatar/master' 2011-09-07 22:58:39 +02:00
flv_fmt lavf-regression: minimal metadata test. 2011-12-12 20:51:29 +01:00
gif ffmpeg: deprecate loop_input and loop_output options 2011-07-08 19:58:19 +02:00
gxf gxfenc: support timecode option 2011-12-07 15:29:26 +01:00
jpg use mpeg2 quantization bias for mjpeg. 2010-03-15 16:37:02 +00:00
mkv lavf-regression: minimal metadata test. 2011-12-12 20:51:29 +01:00
mmf Place regression test output files in subdirs per family 2010-03-02 21:41:52 +00:00
mov Merge remote-tracking branch 'qatar/master' 2012-01-11 02:44:43 +01:00
mpg lavf/utils.c: Order packets with identical PTS by stream index. 2011-04-12 19:06:26 -04:00
mulaw Place regression test output files in subdirs per family 2010-03-02 21:41:52 +00:00
mxf Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
mxf_d10 rematrix: dont use floats for int16 code. 2011-09-19 09:25:50 +02:00
nut lavf-regression: minimal metadata test. 2011-12-12 20:51:29 +01:00
ogg lavf-regression: minimal metadata test. 2011-12-12 20:51:29 +01:00
pbmpipe Place regression test output files in subdirs per family 2010-03-02 21:41:52 +00:00
pcx regtest: place image sequence outputs in separate directories 2010-03-07 19:25:58 +00:00
pgm regtest: place image sequence outputs in separate directories 2010-03-07 19:25:58 +00:00
pgmpipe Place regression test output files in subdirs per family 2010-03-02 21:41:52 +00:00
pixfmt regtests/sws: update checksums for recent changes 2011-07-11 03:54:30 +02:00
png PNG image regression testing 2010-08-31 17:53:48 +00:00
ppm regtest: place image sequence outputs in separate directories 2010-03-07 19:25:58 +00:00
ppmpipe Place regression test output files in subdirs per family 2010-03-02 21:41:52 +00:00
rm lavf-regression: minimal metadata test. 2011-12-12 20:51:29 +01:00
rso Enable already existing rso regression test. 2011-12-11 09:45:17 +01:00
sgi regtest: place image sequence outputs in separate directories 2010-03-07 19:25:58 +00:00
sox Add regression test for "sox" format muxer/demuxer. 2011-12-11 09:45:17 +01:00
swf Place regression test output files in subdirs per family 2010-03-02 21:41:52 +00:00
tga regtest: place image sequence outputs in separate directories 2010-03-07 19:25:58 +00:00
tiff regtest: place image sequence outputs in separate directories 2010-03-07 19:25:58 +00:00
ts lavf-regression: minimal metadata test. 2011-12-12 20:51:29 +01:00
voc Place regression test output files in subdirs per family 2010-03-02 21:41:52 +00:00
voc_s16 Add regression test for stereo s16le in voc. 2011-01-19 12:51:42 +00:00
wav riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header 2011-10-14 13:28:58 +02:00
wtv lavf-regression: minimal metadata test. 2011-12-12 20:51:29 +01:00
yuv4mpeg Place regression test output files in subdirs per family 2010-03-02 21:41:52 +00:00