FFmpeg/vsynth1-avui at 63ce041a7d06d9b411ab148289e1af9a407dfaea - FFmpeg - Gitea: Git with a cup of tea

ffmpeg/FFmpeg

mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-27 16:50:48 +00:00

Michael Niedermayer 800ea20cad Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: Make tkhd "enabled" flag QuickTime compatible

Conflicts:
	libavformat/movenc.c
	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/vsynth/vsynth1-dnxhd-1080i
	tests/ref/vsynth/vsynth1-mpeg4
	tests/ref/vsynth/vsynth1-prores
	tests/ref/vsynth/vsynth1-qtrle
	tests/ref/vsynth/vsynth1-svq1
	tests/ref/vsynth/vsynth2-dnxhd-1080i
	tests/ref/vsynth/vsynth2-mpeg4
	tests/ref/vsynth/vsynth2-prores
	tests/ref/vsynth/vsynth2-qtrle
	tests/ref/vsynth/vsynth2-svq1

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-08-23 13:49:24 +02:00

5 lines

253 B

Plaintext

Raw Blame History

 af74b378fb938d5ea6e0a37c149f16 *tests/data/fate/vsynth1-avui.mov
 42624917 tests/data/fate/vsynth1-avui.mov
 c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-avui.out.rawvideo
 stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200