1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02: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
..
2013-05-10 16:10:52 -03:00
2013-05-10 16:53:50 -03:00
amv
2013-05-19 07:09:36 +02:00
ast
bfi
caf
2013-02-20 04:13:33 +01:00
dpx
2013-03-22 09:20:45 +01:00
2013-08-20 18:47:20 +02:00
2013-08-20 18:47:20 +02:00
2013-08-20 18:47:20 +02:00
2013-05-12 11:47:30 +00:00
2013-05-12 11:47:30 +00:00
2013-05-12 11:47:30 +00:00
2013-05-12 11:47:30 +00:00
2013-07-28 16:39:06 +02:00
2013-07-28 16:39:06 +02:00
2013-07-28 16:39:06 +02:00
2013-02-20 04:13:33 +01:00
2013-03-24 23:16:40 +01:00
2013-03-19 16:20:22 +01:00
2013-05-24 17:47:02 +02:00
2013-04-12 16:40:35 +02:00
2013-06-01 22:35:04 +02:00
2013-06-01 22:35:04 +02:00
2013-08-09 23:02:48 +02:00
2013-08-09 23:02:48 +02:00
2013-08-09 23:02:48 +02:00
2013-08-09 23:02:48 +02:00
2013-08-09 23:02:48 +02:00
2013-08-09 23:02:48 +02:00
2013-08-09 23:02:48 +02:00
2013-08-09 23:02:48 +02:00
2013-08-09 23:02:48 +02:00
2013-05-21 12:56:11 +02:00
2013-08-09 23:02:48 +02:00
2013-02-24 19:27:26 +00:00
2013-02-24 19:27:26 +00:00
2013-02-24 19:27:26 +00:00
2013-04-30 11:06:03 +02:00
jv
md5
mkv
2013-05-07 05:30:19 +02:00
mtv
2013-05-13 21:42:37 +02:00
ptx
2013-05-10 16:53:02 -03:00
2013-06-15 18:54:01 -03:00
rl2
2013-05-10 16:52:10 -03:00
sha
2013-06-02 11:27:19 +02:00
smc
2013-05-30 03:31:04 +02:00
2013-04-07 13:25:24 +02:00
thp
tmv
2013-03-22 20:10:56 +01:00
url
vb
vp5
w64