xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-12-03 00:56:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
800ea20cad
FFmpeg/tests/ref
History
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
..
acodec Merge remote-tracking branch 'qatar/master' 2013-08-23 13:49:24 +02:00
fate Merge remote-tracking branch 'qatar/master' 2013-08-23 13:49:24 +02:00
lavf Merge remote-tracking branch 'qatar/master' 2013-08-23 13:49:24 +02:00
lavf-fate lavf/id3v2enc: fix cover art display on some software 2013-05-30 21:16:57 +00:00
seek ffmpeg: remove obsolete workaround in trim insertion. 2013-08-07 16:20:41 +02:00
vsynth Merge remote-tracking branch 'qatar/master' 2013-08-23 13:49:24 +02:00
vsynth1
vsynth2