1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
FFmpeg/libavformat
Michael Niedermayer 4c91599484 Merge commit 'f90729699db9ede2bef2b28000f1795dab1b8996'
* commit 'f90729699db9ede2bef2b28000f1795dab1b8996':
  mov: Do not group tracks if more than one is enabled per type

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-11 12:41:57 +02:00
..
2014-07-04 02:10:26 +02:00
2014-06-03 10:58:19 -08:00
2014-05-17 20:13:33 +02:00
2014-06-03 10:58:19 -08:00
2014-06-18 14:55:28 +02:00
2014-06-18 14:55:28 +02:00
2014-06-18 14:55:28 +02:00
2014-06-03 10:58:19 -08:00
2014-07-03 15:46:26 +02:00
2014-07-04 02:10:26 +02:00
2014-06-03 10:58:19 -08:00
2014-05-17 20:13:33 +02:00
2014-06-30 05:08:16 +02:00
2014-06-07 14:43:07 +02:00