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-08-20 18:47:20 +02:00
2013-05-12 13:07:47 +02:00
2013-08-23 13:49:24 +02:00
2013-07-26 11:12:11 +02:00
2012-01-19 01:19:38 +01:00
2013-08-20 18:47:20 +02:00
2012-01-21 12:04:46 +01:00
2013-07-10 15:12:05 -04:00
2013-08-03 15:00:15 +02:00
2013-08-20 18:47:20 +02:00
2012-10-16 14:04:14 +02:00
2012-05-30 05:57:56 +02:00
2012-06-07 21:45:52 +02:00
2012-10-08 11:03:27 +02:00
2013-07-19 18:55:49 +02:00
2013-03-27 01:38:18 +01:00
2012-05-30 01:40:54 +02:00
2012-06-07 21:45:52 +02:00