Merge commit 'ea15a9a5d8fa6a71af3101b2af18c4dcac07987f'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 12:47:08 +0000 (13:47 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 12:47:08 +0000 (13:47 +0100)
commit0bb474f686fb33ef731e34972e48b82dfbf82984
tree865588040d395f648e3c01c5f173fac2e3240680
parenteea2cd23e91ab930631d66e8ade401ece705802e
parentea15a9a5d8fa6a71af3101b2af18c4dcac07987f
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>
tools/qt-faststart.c