1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-14 22:22:59 +02:00
FFmpeg/libavformat
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-06-09 01:10:36 +02:00
2013-06-09 01:10:36 +02:00
2013-08-11 21:46:09 +02:00
2013-07-30 15:29:12 +02:00
2013-07-01 21:37:16 +00:00
2013-06-28 09:04:16 +02:00
2013-05-29 10:40:13 +00:00
2013-08-02 13:05:16 +02:00
2013-06-29 18:02:37 +02:00
2013-06-20 21:49:02 +02:00
2013-05-24 15:36:54 +02:00
2013-07-02 18:52:45 +02:00
2013-06-15 18:50:11 -03:00
2013-07-07 18:50:03 +02:00
2013-05-23 14:46:01 +02:00
2013-08-09 23:02:48 +02:00
2013-07-06 22:27:35 +02:00
2013-08-05 02:53:16 +02:00
2013-08-15 15:46:25 +02:00
2013-05-18 07:12:56 +02:00
2013-05-10 16:53:50 -03:00
2013-05-26 15:48:50 +02:00
2013-08-05 10:14:42 +02:00
2013-06-16 18:56:56 +00:00
2013-08-21 05:51:41 +02:00
2013-05-29 18:14:43 +00:00
2013-06-02 11:25:56 +02:00