1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Michael Niedermayer 0bb474f686 Merge commit 'ea15a9a5d8fa6a71af3101b2af18c4dcac07987f'
* commit 'ea15a9a5d8fa6a71af3101b2af18c4dcac07987f':
  qt-faststart: Simplify code by using a MIN() macro

Conflicts:
	tools/qt-faststart.c

See: 59003fe7c064e98359cce83b1b727fb1026bdf12
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-01 13:47:08 +01:00
..
2012-10-26 18:24:50 +02:00
2013-03-07 01:12:04 +01:00
2013-09-24 16:29:18 +02:00
2013-01-15 22:50:19 +01:00
2013-09-21 14:40:31 +02:00
2012-10-13 20:35:56 +02:00
2012-09-15 15:40:36 -04:00
2013-12-23 18:44:52 +01:00
2013-05-19 17:59:21 +02:00